tell git to use ours merge strategy on specific files

by 
$ git config merge.ours.driver true

or even 

$ git config --global merge.ours.driver true

‘ours’ isn’t one of the built-in merge drivers even though it’s perfectly clear to you and me what it should do, and it seems git doesn’t error out when a custom merge driver is undefined.

(true above is just the unix true command, its success says it made the local version look right, in this case by doing nothing to it.)

More Related Contents:

  1. How do I resolve merge conflicts in a Git repository?
  2. What is the best (and safest) way to merge a Git branch into master?
  3. Is there a “theirs” version of “git merge -s ours”?
  4. Re-doing a reverted merge in Git
  5. Undo git pull, how to bring repos to old state
  6. When would you use the different git merge strategies?
  7. How to import existing Git repository into another?
  8. What’s the difference between ‘git merge’ and ‘git rebase’?
  9. How can I prevent foxtrot merges in my ‘master’ branch?
  10. How can I merge two commits into one if I already started rebase?
  11. How to resolve git error: “Updates were rejected because the tip of your current branch is behind”
  12. How do I ‘overwrite’, rather than ‘merge’, a branch on another branch in Git?
  13. I ran into a merge conflict. How do I abort the merge?
  14. What’s the simplest way to list conflicted files in Git?
  15. Git merge hotfix branch into feature branch
  16. Get changes from master into branch in Git
  17. Git merge error “commit is not possible because you have unmerged files”
  18. Find unmerged Git branches?
  19. Merging without whitespace conflicts
  20. error: Your local changes to the following files would be overwritten by checkout
  21. Is it possible to pull just one file in Git?
  22. Tell git not to merge binary files but to choose
  23. How to keep a branch synchronized/updated with master?
  24. Git merge doesn’t use default merge message, opens editor with default message
  25. How to see commits that were merged in to a merge commit?
  26. Merge, update, and pull Git branches without using checkouts
  27. Git: Merge a Commit into a different Branch
  28. Restore git files deleted after git merge –abort
  29. The following untracked working tree files would be overwritten by merge, but I don’t care
  30. How do you detect an evil merge in git?

Leave a Comment