git merge, keep both

by

There is no ‘merge strategy’ for resolving these conflicts.

However, if you truly want a conflict like:

<<<< ours
Foo
=========
Bar 
>>>> theirs

to resolve to

Foo
Bar

then you can configure the ‘merge driver’. From the gitattributes man page:

union

Run 3-way file level merge for text files, but take lines from
both versions, instead of leaving conflict markers. This tends to
leave the added lines in the resulting file in random order and the
user should verify the result. Do not use this if you do not
understand the implications.

Add a line to .gitattributes to use this:

*.whatever merge=union

More Related Contents:

  1. Undo a Git merge that hasn’t been pushed yet
  2. I ran into a merge conflict. How can I abort the merge?
  3. What is the best (and safest) way to merge a Git branch into master?
  4. Is there a “theirs” version of “git merge -s ours”?
  5. How can I merge multiple commits onto another branch as a single squashed commit?
  6. Merge, update, and pull Git branches without using checkouts
  7. Re-doing a reverted merge in Git
  8. Is there a git-merge –dry-run option?
  9. When would you use the different git merge strategies?
  10. What’s the difference between ‘git merge’ and ‘git rebase’?
  11. How do I safely merge a Git branch into master?
  12. I ran into a merge conflict. How do I abort the merge?
  13. What’s the simplest way to list conflicted files in Git?
  14. Git merge hotfix branch into feature branch
  15. Get changes from master into branch in Git
  16. Which version of the git file will be finally used: LOCAL, BASE or REMOTE?
  17. Git merge error “commit is not possible because you have unmerged files”
  18. Merge development branch with master
  19. how can I customize git’s merge commit message?
  20. error: Your local changes to the following files would be overwritten by checkout
  21. How can I configure KDiff3 as a merge tool and diff tool for git?
  22. How do I fix a merge conflict due to removal of a file in a branch?
  23. Sharing rerere cache
  24. Tell git not to merge binary files but to choose
  25. How to keep a branch synchronized/updated with master?
  26. How to merge specific files from Git branches
  27. git: merge two branches: what direction?
  28. Telling if a Git commit is a Merge/Revert commit
  29. Restore git files deleted after git merge –abort
  30. How to quit (not abort) a Git merge in progress keeping the changes uncommitted?

Leave a Comment