During a merge containing conflicts, in previous versions of sourcetree, I have been able to right click on a file containing a conflict and then open the conflict in a external merge tool (Kaleidoscope). Right now it lets me select that option and creates the 4 merge conflict files (local, remote, etc) but fails to open the actual tool.
I don't see a git merge tool command in the command window, but I am not sure if it used to do that.
Version: Version 2.2.2 (51)
Badges are a great way to show off community activity, whether you’re a newbie or a Champion.Learn more
Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs