Earn badges and make progress
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
Participate in fun challenges
Challenges come and go, but your rewards stay with you. Do more to earn more!
Gift kudos to your peers
What goes around comes around! Share the love by gifting kudos to your peers.
Rise up in the ranks
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
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.
Merging with BeyondCompare not working
Hi,
I'm using the latest versions of SourceTree (3.0.8) and BeyondCompare (4.2.6) and for some reason when I try to resolve conflicts, SourceTree launches BeyondCompare but not the merge window but the diff window.
This use to work some versions back, the merge windows will comprise of 4 panes as set in the arguments (see image below) and the diff window would only show 2 panes (local and remote)
When right click on a conflicted files and select the option in source tree 'resolve using external tool' I just get the 2 panes which to me seems to be showing me the diff tool. Even with just using these two panes to resolve conflicts, when I save the file and close BeyondCompare the SourceTree prompt with an abort button informing me the external merge tool is still open and I need to close it.
Any ideas whats going on?
Thank you,
David
2 answers
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.