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 220.127.116.11 of sourcetree. I also tried adding the beyond compare executable to my path but it did not help.
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: https://answers.atlassian.com/questions/12258328
Is this what is happening to you?
Someone in this bug report was able to do it from the command line: https://jira.atlassian.com/browse/SRCTREEWIN-1259 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.
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 ...
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