`git merge -s theirs` needed but it does not exist

by

Many thanks to @VonC for suggesting the use of the merge=custom-driver attribute in the .gitattributes file. While this will work, I’m reluctant to pollute my workspace with .git files, and while I could use $GIT_DIR/info/attributes to avoid the pollution, I’m bothered by the need for 2 rules to catch dot-files and non-dot files.

After a bit of experimentation I managed to get a solution with the merge.default configuration variable (mentioned in the gitattributes(5) manpage) working. The trick I missed was that merge.default takes the name of a custom driver you have defined previously; you don’t give it the custom command directly. Here’s what works for me…

First define your copy-merge custom driver. You can use shell commands directly; there’s no need for an external script (just make sure you get your shell meta-character quoting right):

git config merge.copy-merge.name   'Copy Merge'
git config merge.copy-merge.driver 'mv %B %A'

Note that mv returns 0 on success, 1 on failure, meeting the criteria for reporting merge “success” back to git.

Now tell git that ALL merges are copy-merges:

git config merge.default copy-merge

Hey Presto! Job done. git merge <branch> will now copy-merge everything so the branch you’re on contains exact copies of all files on <branch>. QED.

If you want to do a non-copy-merge then simply reset the default merge driver:

git config --unset merge.default

If you do want to be more selective then leave merge.default unset and use attributes as @VonC says:

cd path/to/copy-merge/in
echo '* merge=copy-merge'  >  .gitattributes
echo '.* merge=copy-merge' >> .gitattributes

Do this at the top of every subtree you want to copy-merge in. If there’s a sub-subtree that you DON’T want to copy-merge in, you can turn it off again:

cd path/to/copy-merge/in/path/to/normal-merge/in
echo '* merge'  >  .gitattributes
echo '.* merge' >> .gitattributes

WARNING: littering your working tree with lots of .gitattributes files is bound to lead to confusion, especially if you also use things like “*.bin -merge” in other directories to force all merges of .bin files to fail with conflicts. It may be better to use $GIT_DIR/info/attributes for this sort of thing, as it has the highest precedence.

More Related Contents:

  1. How to replace master branch in Git, entirely, from another branch? [duplicate]
  2. How do you merge two Git repositories?
  3. How to merge a specific commit in Git
  4. Git cherry pick and datamodel integrity
  5. Updates were rejected because the remote contains work that you do not have locally
  6. Is it possible for git-merge to ignore line-ending differences?
  7. Merging: Hg/Git vs. SVN
  8. What is the precise meaning of “ours” and “theirs” in git?
  9. git cherry-pick says “…38c74d is a merge but no -m option was given”
  10. Git – Ignore files during merge
  11. Git Cherry-pick vs Merge Workflow
  12. Trying To Understand/Determine A Basic Git Workflow
  13. git rebase and git push: non-fast forward, why use?
  14. Disable Git Rename Detection
  15. git partial merge, not whole branch
  16. Simple tool to ‘accept theirs’ or ‘accept mine’ on a whole file using git
  17. How can I get the parents of a merge commit in Git?
  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. Reverting a git merge while allowing for the same merge later)
  22. Error “Updates were rejected because the remote contains work that you do not have locally”
  23. Git: How to create patches for a merge?
  24. git: How do I add a custom merge strategy?
  25. Git copy file preserving history [duplicate]
  26. How do I make git merge’s default be –no-ff –no-commit?
  27. How to perform a three-way diff in Git without merging?
  28. git subtree: possible to change subtree branch/path in a forked repository?
  29. Whats the Proper usage of .gitattributes with merge=ours
  30. How do you see / show a git merge conflict resolution that was done, given a merge commit SHA1?

Leave a Comment