How Do I Turn Back on Three-Way Merge?

Question

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

PatrickRyder · Answer

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

Mike Corsaro · Answer

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\"