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

Merging with BeyondCompare not working

David October 25, 2018

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?

 

2018-10-25_1248.png

 

Thank you,

David

2 answers

0 votes
Maksim Anishchenko
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!
March 7, 2019

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 https://www.scootersoftware.com/shop.php?zz=kb_editions

Best regards, Maksim

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

Hi

It sounds like a bug we will investigate.

David October 29, 2018

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

 

David.

David February 5, 2019

Hi,

Just wondering if this has been fixed.

Thank You.

minnsey
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
March 7, 2019

Hi

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

Atlassian Community Events