Which version of the git file will be finally used: LOCAL, BASE or REMOTE?

git git-merge meld
tsusanka picture tsusanka · Jun 21, 2012 · Viewed 98.8k times · Source

When there's a collison during git merge, I open a mergetool called Meld. It opens three files LOCAL, BASE and REMOTE. As I've read LOCAL is my local branch, BASE is common ancestor and REMOTE is the branch to be merged.

Now to my question: which version of the file will be finally used? Is it REMOTE? If so, can I edit it as I want, regardless what's in the BASE branch for example?

Answer

Fabien Quatravaux picture Fabien Quatravaux · Jun 21, 2012

It's the one in the middle : BASE.

In fact, BASE is not the common ancestor, but the half-finished merge where conflicts are marked with >>>> and <<<<.

You can see the file names on the top of meld editing window.

See the screenshot here

meld base

You can edit the BASE file as you want with or without using meld commands.
You can also get rid of meld and just edit the file with your favorite text editor.

  • The code between <<<< HEAD and ===== markers is the one of your local file before the merge.
  • The code between ==== and >>>> <branch name> is the one of the remote file.

Related questions

Git merging one branch into another is a two way merge?

My git repo looks like this: _ branch_a / master / \_ branch_b Now I want to merge branch_b into branch_a, not either branch into master. So, I did git checkout branch_a git merge branch_b And git went …

Read More
How to resolve merge conflicts in Git repository?

I want to resolve merge conflicts in my Git repository. How to do that ?

Read More
Undo a Git merge that hasn't been pushed yet

Within my master branch, I did a git merge some-other-branch locally, but never pushed the changes to origin master. I didn't mean to merge, so I'd like to undo it. When doing a git status after my merge, I was …

Read More