Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
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

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
Community showcase
Published in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

7,136 views 5 13
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you