SourceTree Always Shows Two-Way merge with Filemerge.

I have recently setup a new co-worker w/ SourceTree. When he tries to resolve conflicts it uses Filemerge and always shows a two-way view. We have been unable to find a difference between my setup (I get three-way merges) and his without any luck. Is there any known cause for this? 

1 answer

I've had that happen.  If you look at the  horizontal line  that is the bottom border of the right and left panes,  in the center you should see  a very small, half-shaded, circle.  Drag up on that  and the third pane will appear.

 

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Oct 23, 2018 in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

715 views 3 2
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you