Understanding Git merge in sourcetree/diffmerge

I use Diffmerge as my external tool but I think this is more of a git/brancing question.

When I have a conflict in a merge, what do each of the three windows correspond to?

Say I'm on branch "dev" and want to merge master into it. I click merge - from fetched(master).. When I get conflicts and go to resolve I have the following three windows for my resolutions:

Local/base/remote

I understand local is what I have, base is what will result in the merge. Does remote mean what is currently in the branch that I'm merging FROM(master)?

I would assume so as it has the changes coming in, but I want to make sure.

thanks

1 answer

I am not familiar with DiffMerge, so I cannot say which one is the file that will have the result (in most diff programs, base is in the middle and you merge into that from the two sides), but these are the inputs:

local: the file in the target (dev) branch

remote: the file in the source (master) branch

base: the file at the commit which is the last common ancestor of the two (the point where dev diverges from master)

Suggest an answer

Log in or Sign up to answer
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Asked 2 hours ago in Confluence

What are the resources that you use to learn more about Atlassian Products?

I am gathering information about resources available for Atlassian product knowledge transferring for a presentation in our local Atlassian User Group. I want to group them in four categories From ...

24 views 2 3
View question

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