I cannot start the external merge tool from sourcetree after upgrading to Mountain Lion and Xcode 4.6. All the necesary commands are in place because I can run them from the console. However, it seems something changed because sourcetree is not able to show the GUI. It just shows a dialog that dissapear very quickly and generates all the LOCAL, BASE and REMOTE version files of the conflicts.
This could be down to your command line tools having problems. Check the following document to see if this resolves it: https://confluence.atlassian.com/pages/viewpage.action?pageId=267258218
Wonderful, it works now. I create the symbolic link before, so I was missing just this piece of magic:
Alternatively, add /Developer/usr/bin to your path. You need to do this in two places:
Thanks a billion Kieran!!
I found this happening sometimes with me but I noticed that the files that had trouble starting up in with the third party GUI didn't seem to have any real conflicts e.g. were new files or conflicts were perhaps resolved automatically so I generally just had to "abort" the third party merge tool and just mark them as resolved.
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