After updating the SourceTree to it’s latest version I am fighting with this issue. Assume following scenario: There are file A, B and C under the version control and there is just one branch. In my working copy, I make some changes to the file A so it turns into a A’ as well as the file B to B’. Someone else in his working copy makes … Read more
First I modified my $PATH: sudo nano /etc/paths so that /Library/Frameworks/Python.framework/Versions/3.6/bin was not being invoked. I made sure my paths were in the right order so that python looked for /usr/local/bin/python3 and /usr/local/bin/python2 first to force the issue. However, $ python3 –version still returned Python 3.6.0, though brew says python3 3.6.2 already installed. brew doctor to the rescue: homebrew recommended a couple things. python was incorrectly symlinked so … Read more
In the simplest terms, git pull does a git fetch followed by a git merge. You can do a git fetch at any time to update your remote-tracking branches under refs/remotes/<remote>/. This operation never changes any of your own local branches under refs/heads, and is safe to do without changing your working copy. I have even heard of people running git fetch periodically in a cron … Read more
The Problem There are a number of work-flows you can use. The main point is not to break history in a published branch unless you’ve communicated with everyone who might consume the branch and are willing to do surgery on everyone’s clones. It’s best not to do that if you can avoid it. Solutions for … Read more
To permanently accept a specific certificate Try http.sslCAPath or http.sslCAInfo. Adam Spiers’s answer gives some great examples. This is the most secure solution to the question. To disable TLS/SSL verification for a single git command try passing -c to git with the proper config variable, or use Flow’s answer: To disable SSL verification for a … Read more
⚠ Important: If you have any local changes, they will be lost. With or without –hard option, any local commits that haven’t been pushed will be lost.[*] If you have any files that are not tracked by Git (e.g. uploaded user content), these files will not be affected. First, run a fetch to update all origin/<branch> refs to latest: Backup your … Read more
Another quicker way is: You don’t need to include –include-untracked if you don’t want to be thorough about it. After that, you can drop that stash with a git stash drop command if you like.