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
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Brian Ganninger
Published Jan 23, 2018 in Sourcetree

Tip from the team: workflow and keyboard shortcuts

Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...

797 views 0 4
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