Best IT Recipes

In conflict with git merge, which BACKUP, BASE, LOCAL and REMOTE files are generated?

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

+42
git
Dec 04 '13 at 17:14
source share
1 answer

Git performs a three-way merge, finding a common ancestor (aka “merging base”) of the two branches that you merge. When you call git mergetool in a conflict, it will create these files suitable for submission to a typical 3-sided merge tool. In this way:

  • foo.LOCAL : "our" side of the conflict - i.e. your branch ( HEAD ) that will contain the merge results
  • foo.REMOTE : "their" side of the conflict is the branch that you merge into HEAD
  • foo.BASE : a common ancestor. useful for filing in a tripartite merger tool
  • foo.BACKUP : the contents of the file before calling the merge tool will be stored in the file system if mergetool.keepBackup = true .
+69
Dec 04 '13 at 17:48
source share


More articles:


All Articles