How does ‘git merge’ work in details?

by

You might be best off looking for a description of a 3-way merge algorithm. A high-level description would go something like this:

  1. Find a suitable merge base B – a version of the file that is an ancestor of both of the new versions (X and Y), and usually the most recent such base (although there are cases where it will have to go back further, which is one of the features of gits default recursive merge)
  2. Perform diffs of X with B and Y with B.
  3. Walk through the change blocks identified in the two diffs. If both sides introduce the same change in the same spot, accept either one; if one introduces a change and the other leaves that region alone, introduce the change in the final; if both introduce changes in a spot, but they don’t match, mark a conflict to be resolved manually.

The full algorithm deals with this in a lot more detail, and even has some documentation (https://github.com/git/git/blob/master/Documentation/technical/trivial-merge.txt for one, along with the git help XXX pages, where XXX is one of merge-base, merge-file, merge, merge-one-file and possibly a few others). If that’s not deep enough, there’s always source code…

More Related Contents:

  1. Git – how to force merge conflict and manual merge on selected file
  2. How do you see / show a git merge conflict resolution that was done, given a merge commit SHA1?
  3. How to merge a specific commit in Git
  4. How to import existing Git repository into another?
  5. Git cherry pick and datamodel integrity
  6. What’s the difference between ‘git merge’ and ‘git rebase’?
  7. How can I prevent foxtrot merges in my ‘master’ branch?
  8. Updates were rejected because the remote contains work that you do not have locally
  9. `git merge -s theirs` needed but it does not exist
  10. Git Cherry-pick vs Merge Workflow
  11. Merge changes from remote github repository to your local repository
  12. git merge: Removing files I want to keep!
  13. How do I use `git rebase -i` after `git merge` without messing things up?
  14. Making Git retain different section content between branches
  15. Git: Merge to master while automatically choosing to overwrite master files with branch
  16. How to “git show” the diffs for a merge commit?
  17. Git: merging public and private branches while while keeping certain files intact in both branches
  18. How would I write a pre-merge hook in Git?
  19. Are there any downsides to enabling git rerere?
  20. How to rebase one Git repository onto another one?
  21. Error “Updates were rejected because the remote contains work that you do not have locally”
  22. What to do with branch after merge
  23. Tell git not to merge binary files but to choose
  24. git: How do I add a custom merge strategy?
  25. Git: Merge a Commit into a different Branch
  26. How do I manage conflicts with git submodules?
  27. How do I make git merge’s default be –no-ff –no-commit?
  28. Git merge squash repeatedly
  29. How to perform a three-way diff in Git without merging?
  30. The following untracked working tree files would be overwritten by merge, but I don’t care

Leave a Comment