When would you use the different git merge strategies?

by

I’m not familiar with resolve, but I’ve used the others:

Recursive

Recursive is the default for non-fast-forward merges. We’re all familiar with that one.

Octopus

I’ve used octopus when I’ve had several trees that needed to be merged. You see this in larger projects where many branches have had independent development and it’s all ready to come together into a single head.

An octopus branch merges multiple heads in one commit as long as it can do it cleanly.

For illustration, imagine you have a project that has a master, and then three branches to merge in (call them a, b, and c).

A series of recursive merges would look like this (note that the first merge was a fast-forward, as I didn’t force recursion):

series of recursive merges

However, a single octopus merge would look like this:

commit ae632e99ba0ccd0e9e06d09e8647659220d043b9
Merge: f51262e... c9ce629... aa0f25d...

octopus merge

Ours

Ours == I want to pull in another head, but throw away all of the changes that head introduces.

This keeps the history of a branch without any of the effects of the branch.

(Read: It is not even looked at the changes between those branches. The branches are just merged and nothing is done to the files. If you want to merge in the other branch and every time there is the question “our file version or their version” you can use git merge -X ours)

Subtree

Subtree is useful when you want to merge in another project into a subdirectory of your current project. Useful when you have a library you don’t want to include as a submodule.

More Related Contents:

  1. How to import existing Git repository into another?
  2. What’s the difference between ‘git merge’ and ‘git rebase’?
  3. How can I prevent foxtrot merges in my ‘master’ branch?
  4. Tell git not to merge binary files but to choose
  5. git: merge two branches: what direction?
  6. Git: Merge a Commit into a different Branch
  7. The following untracked working tree files would be overwritten by merge, but I don’t care
  8. How do I resolve merge conflicts in a Git repository?
  9. How to merge a specific commit in Git
  10. Undo git pull, how to bring repos to old state
  11. How to resolve git error: “Updates were rejected because the tip of your current branch is behind”
  12. `git merge -s theirs` needed but it does not exist
  13. Git Cherry-pick vs Merge Workflow
  14. How do I ‘overwrite’, rather than ‘merge’, a branch on another branch in Git?
  15. Get changes from master into branch in Git
  16. Find unmerged Git branches?
  17. Merging without whitespace conflicts
  18. Git: merging public and private branches while while keeping certain files intact in both branches
  19. How would I write a pre-merge hook in Git?
  20. Are there any downsides to enabling git rerere?
  21. Is it possible to pull just one file in Git?
  22. Error “Updates were rejected because the remote contains work that you do not have locally”
  23. Git merge doesn’t use default merge message, opens editor with default message
  24. git: How do I add a custom merge strategy?
  25. How do I make git merge’s default be –no-ff –no-commit?
  26. Telling if a Git commit is a Merge/Revert commit
  27. Git merge branch into master
  28. How to perform a three-way diff in Git without merging?
  29. How to quit (not abort) a Git merge in progress keeping the changes uncommitted?
  30. How do you see / show a git merge conflict resolution that was done, given a merge commit SHA1?

Leave a Comment