SourceTree is not able to start the external merge tool

Hi,

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.

Please help!

Thanks.

2 answers

Hi narko,

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

Cheers

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:

  1. /etc/paths - this is the $PATH that GUI applications use. You may need to restart your computer for this to take effect.
  2. Your ~/.bash_profile or similar

Thanks a billion Kieran!!

I am having the same problem only on a Windows 7 box. I see the LOCAL, BASE and REMOTE version files of the conflicts and I can see sh.exe in my task manager however the third party gui never comes up. I can manually bring up the gui however. Any ideas?

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.

Suggest an answer

Log in or Sign up to answer
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Brian Ganninger
Published Jan 23, 2018 in Sourcetree

Tip from the team: workflow and keyboard shortcuts

Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...

799 views 0 4
Read article

Atlassian User Groups

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!

Find my local user group

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

Groups near you