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

How Do I Turn Back on Three-Way Merge?

Sorry for the vagueness of this question.

When I had a merge conflict, I used to get a warning dialog.  At this point, opening my external diff tool (Beyond Compare 4) showed three panes, allowing a 3-way merge.  This is the behaviour I want.

I made the mistake of clicking the little checkbox in the corner of the SourceTree dialog, thinking this would just get rid of the warning dialog, which really isn't necessary to see all the time.  Unfortunately, this seems to have made a permanent change to the way SourceTree works.  Now it automatically stages what it can and opening my diff tool shows only two panes, one of which shows the familiar text-based Git markers shown below.

Does anyone know how to go back to the original state, where a merge conflict gives a 3-way merge?

Kind wishes ~ Patrick

 

Markers I am now seeing when I open my external diff tool:

<<<<<<< HEAD
   Console.WriteLine( FeatureSix.Name );

=======
   Console.WriteLine( FeatureFive.Name );
>>>>>>> feature_five

 

 

1 answer

0 votes
Mike Corsaro Atlassian Team Apr 02, 2018

Hello! While I'm not sure why 3-way merge isn't working anymore, you could probably try and verify the current settings for your merge tool by opening "C:\Users\{USERNAME}\.gitconfig" and looking for the "[mergetool "sourcetree"]" section. It should look something like this:

 

cmd = '{PATH TO BC4}' \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"

Thank you for the reply, Mike.  Unfortunately, that all appears to be correct.

I turned it off by clicking an innocent-looking check box on the dialog that pops up as Beyond Compare was launched.  The dialog is, in my opinion, badly worded because I thought I was just turning it off for that particular commit.  It seems to have changed a setting in the UI somewhere and I can't find anywhere in the UI to turn it back on.

Guess I'll have to try a reinstall. 

 

- Patrick

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