Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Beyond Compare Merge Won't Complete

Patrick Duffy
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
January 13, 2021

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
AUG Leaders

Atlassian Community Events