You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
Next: Root
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
The Atlassian Community can help you and your team get more value out of Atlassian products and practices.
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?