git: How do I add a custom merge strategy?

by

In this case, you didn’t configure a merge strategy, you configured a merge driver:

A merge strategy is a program that determines how two (or more) commits are merged. By default, git merge uses the “recursive” strategy, found in the program git-merge-recursive. By specifying the --strategy <strategy> flag to git-merge (or git-pull) you tell it to invoke a different strategy. If you want to plug in your own merge strategy, you can, by creating an executable git-merge-mystrategy in your path and running git merge --strategy mystrategy.

This is different than a merge driver. A merge driver is the mechanism used to resolve a conflict on a file that exists when merging two commits. You plug in your own merge driver in the manner you outlined, by configuring a merge.mydriver.driver setting.

To enable your merge driver for a particular file, you need to configure the driver for that file in .gitattributes:

filename merge=mydriver

More Related Contents:

  1. How to merge a specific commit in Git
  2. When would you use the different git merge strategies?
  3. How to import existing Git repository into another?
  4. Git cherry pick and datamodel integrity
  5. What’s the difference between ‘git merge’ and ‘git rebase’?
  6. How can I prevent foxtrot merges in my ‘master’ branch?
  7. Updates were rejected because the remote contains work that you do not have locally
  8. What’s the best visual merge tool for Git? [closed]
  9. `git merge -s theirs` needed but it does not exist
  10. Git Cherry-pick vs Merge Workflow
  11. Trying To Understand/Determine A Basic Git Workflow
  12. Merge changes from remote github repository to your local repository
  13. git rebase and git push: non-fast forward, why use?
  14. git merge: Removing files I want to keep!
  15. How do I use `git rebase -i` after `git merge` without messing things up?
  16. Making Git retain different section content between branches
  17. Git: Merge to master while automatically choosing to overwrite master files with branch
  18. How to “git show” the diffs for a merge commit?
  19. Git: merging public and private branches while while keeping certain files intact in both branches
  20. How would I write a pre-merge hook in Git?
  21. Are there any downsides to enabling git rerere?
  22. How to rebase one Git repository onto another one?
  23. Error “Updates were rejected because the remote contains work that you do not have locally”
  24. What to do with branch after merge
  25. Tell git not to merge binary files but to choose
  26. Git: How to create patches for a merge?
  27. Git: Merge a Commit into a different Branch
  28. How do I make git merge’s default be –no-ff –no-commit?
  29. git subtree: possible to change subtree branch/path in a forked repository?
  30. Whats the Proper usage of .gitattributes with merge=ours

Leave a Comment