It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

external merge tool will not start



I can't launch external merge tool from Sourcetree anymore. It might have been broken in the last update, I can't confirm but for sure it has worked before. When I use resolve conflict -> launch external merge tool, I get the "Visual merge in progress" dialog but it never really launches. I tried to use Beyond compare and araxis merge but I get the same problem with both. I use version of sourcetree. I also tried adding the beyond compare executable to my path but it did not help.


Thank you,


Simon Martineau

1 answer

1 accepted

1 vote
Answer accepted

Another user recently discovered in this question that you can not use the external diff tool if the file has been deleted (or renamed) in one of the branches that are being merged:

Is this what is happening to you?

Seth, you are right, it is exactly what is happening to me. One file was renamed. 

Any idea how to make it work with a renamed file?

I should mention the rename was done properly in git. It is not just a remove and add on a different name.

Someone in this bug report was able to do it from the command line: Also, does the merge show a conflict on the old name AND an addition for the new name? You might be able to manually diff the files (new name from branch1 and old name from branch2) into the new name, and delete the old one, then mark conflicts as resolved in SourceTree.

The conflict is on the old file name. The result I would expect would be to have all the changes in the new file and not to have the old file. It looks obvious to me but maybe I am dreaming...

Suggest an answer

Log in or Sign up to answer
This widget could not be displayed.
This widget could not be displayed.
Community showcase
Posted Jan 17, 2019 in Sourcetree

[dev team] Sourcetree for Windows 2019 Preview - Dark Theme

Hi folks, While the full post is over on our blog I'd like to share the dark theme we've got planned for 2019 here directly as well to keep the discussion going.  The ...

1,354 views 13 14
Join discussion

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