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)
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
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