Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,365,715
Community Members
 
Community Events
168
Community Groups

Beyond Compare Merge Won't Complete

I am using Beyond Compare 4 as an external merge tool using the default settings in Sourcetree 3.4.2

Diff Command: C:\Program Files\Beyond Compare 4\BComp.exe

Arguments: \"$LOCAL\" \"$REMOTE\"

Merge Command: C:\Program Files\Beyond Compare 4\BComp.exe

Arguments: \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"

 

When I launch the external merge tool, Beyond Compare launches and I am able to merge the files and save the LOCAL and REMOTE copies. However, when I exit Beyond Compare, Sourcetree still has the "Visual Merge In Progress" window open, waiting for the merge tool to be closed. Is there a configuration or step that I am missing?

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS

Atlassian Community Events