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

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.

Deleted user Avatar
Deleted user

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.

Atlassian Community about banner
Community Members
Community Events
Community Groups

Merging with BeyondCompare not working


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,


2 answers

Hi, David

I suppose you use Standard Edition of Beyond Compare tool. Meanwhile only Pro Edition supports 3-way merging.

You could see the differences between editions here

Best regards, Maksim

0 votes
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
Oct 26, 2018


It sounds like a bug we will investigate.

Thank you for your reply, I would appreciate if you can keep me updated.




Just wondering if this has been fixed.

Thank You.

Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
Mar 07, 2019


We have made some updates to this area that are available in  3.0.17 and additional updates will be coming in the upcoming 3.1 release 

Suggest an answer

Log in or Sign up to answer
AUG Leaders

Atlassian Community Events