In a git merge conflict, what are the BACKUP, BASE, LOCAL, and REMOTE files that are generated?

Git

Git Problem Overview

I assume the LOCAL and REMOTE files are just what their name suggests, but what are BASE and BACKUP for?

Git Solutions

Solution 1 - Git

Git performs a three-way merge, finding the common ancestor (aka "merge base") of the two branches you are merging. When you invoke git mergetool on a conflict, it will produce these files suitable for feeding into a typical 3-way merge tool. Thus:

  • foo.LOCAL: the "ours" side of the conflict - ie, your branch (HEAD) that will contain the results of the merge
  • foo.REMOTE: the "theirs" side of the conflict - the branch you are merging into HEAD
  • foo.BASE: the common ancestor. useful for feeding into a three-way merge tool
  • foo.BACKUP: the contents of file before invoking the merge tool, will be kept on the filesystem if mergetool.keepBackup = true.

Solution 2 - Git

In case of pulling (merging) in changes from a online repository into your local copy, you can understand REMOTE, LOCAL and BASE as:

  • REMOTE = Your local file including own modifications ('as on the filesystem')
  • LOCAL = The remote file inside the online repository ('changes made by other users')
  • BASE = The origin of both files ('without any modifications')

enter image description here

The terms are from the point of view of the online repository which is what 'local' refers to. See also the wikipedia article about three-way merge.

Solution 3 - Git

According to https://git-scm.com/docs/git-mergetool

> When git mergetool is invoked with this tool (either through the -t or --tool option or the merge.tool configuration variable) the configured command line will be invoked with $BASE set to the name of a temporary file containing the common base for the merge, if available; $LOCAL set to the name of a temporary file containing the contents of the file on the current branch; $REMOTE set to the name of a temporary file containing the contents of the file to be merged, and $MERGED set to the name of the file to which the merge tool should write the result of the merge resolution.

However, there seems to be a difference between a rebase command and a merge command.

Merge uses your local branch as LOCAL and the branch you're merging in as REMOTE

Rebase uses your local branch as REMOTE and the branch you're rebasing onto as LOCAL

Categories
Recommended Git Solutions

Previous Solution:

Chrome Extension Message passing: response not sent

JavascriptGoogle ChromeGoogle Chrome-ExtensionGoogle Chrome-App

Next Solution:

Disable password authentication for SSH

UbuntuSsh

Attributions

All content for this solution is sourced from the original question on Stackoverflow.

The content on this page is licensed under the Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) license.

Content TypeOriginal AuthorOriginal Content on Stackoverflow
Questionfiller003View Question on Stackoverflow
Solution 1 - GitEdward ThomsonView Answer on Stackoverflow
Solution 2 - GitFireEmeraldView Answer on Stackoverflow
Solution 3 - GitRikardView Answer on Stackoverflow