You can manually delete .git/MERGE_HEAD and Git won’t be able to tell that you were just doing a merge. It will let you amend the previous commit with the changes in your index just like normal. Please read: Though this would work, it is a hack and not recommended. All is needed here is to … Read more
In the second picture there are branches. Locally you have 2 branches, master & develop. Both branches are resting at the same commit though. If you want to ‘see branches’ as in the first picture you can make a commit on develop, however the graph will still apear to be linear. You’ll be able to … Read more
Go to http://en.gravatar.com/ create your account and upload the avatar image files that map to your emails. Close Source Tree Delete the cache file (or delete all files) inside path %USERPROFILE%\AppData\Local\Atlassian\SourceTree\cache\img e.g. C:\Users\MYUSERNAME\AppData\Local\Atlassian\SourceTree\cache\img Open Source Tree. Now you got what you want!
I feel the existing answers slightly missed the point. Here is my own dog food: Arguments Detail: Diff: $LOCAL $REMOTE Merge: $LOCAL $BASE $REMOTE –auto-merge –output=$MERGED For External Diff, you need to remove $BASE from your argument list. For 3-way merging, you need to click on the External Merge Tool option instead, which will only … Read more
Just had the same issue and solved it. My issue was that I added the generated public ssh key to the repo itself through the ‘settings’ of that repo. The solution was to delete the ssh key from the repo itself. Click on your account. Add the ssh key through ‘settings’ of your account.
Unfortunately, there is no “Revert Pull Request” feature on Bitbucket as of this writing, but a feature request exists for it. Note: Before you proceed, make sure your working copy is clean, with no uncommitted or unpushed changes. So, you’ll have to revert the merge in Git. First, find the SHA hash of the merge … Read more
If you have pushed the commits upstream… Select the commit you would like to roll back to and reverse the changes by clicking Reverse File, Reverse Hunk or Reverse Selected Lines. Do this for all the commits after the commit you would like to roll back to also. If you have not pushed the commits … Read more
I changed the client configuration from putty to openssh. Go to: Menu Tools > Options > SSH Client
You can’t get this in one step. At best you move each branch one by one; this would be the sequence: git rebase –onto master exp1 git rebase –onto c2′ c2 exp2 git rebase –onto c1′ c1 exp3 git rebase –onto master exp4 The key is to rebase from each branch point in the old … Read more
Do you have a diff tool installed on your system? In Mac, when you install Xcode you get a diff tool named FileMerge, simple but sufficient in most of the cases. You can try WinMerge for Windows, I’ve used it in the past and it’s pretty nice, and open source. You can also try the … Read more