I'm using SourceTree 220.127.116.11 on OSX 10.10 and have the latest Xcode and command line tools installed. When trying to do a merge and get conflicts, when launching the external merge tool, I get the window warning to quit the merge tool, then it disappears and nothing happens. Is there a place that an error would be logged?
I'm using FileMerge as the default. I can open it up via spotlight no problem. This used to work a couple of months ago.
I was researching a similar issue with Windows and Beyond Compare. After playing with it all morning I learned that no matter which merge I picked in source tree except System Default it didn't work. I then put it back to System Default and configured git to use the merge tool of my choice and this worked perfectly. I hope this helps.
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
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs