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

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?

 

2018-10-25_1248.png

 

Thank you,

David

2 answers

0 votes
minnsey Atlassian Team Oct 26, 2018

Hi

It sounds like a bug we will investigate.

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

 

David.

Hi,

Just wondering if this has been fixed.

Thank You.

minnsey Atlassian Team Mar 07, 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 

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

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

4,962 views 0 12
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