Choose Git merge strategy for specific files (“ours”, “mine”, “theirs”)

by

For each conflicted file you get, you can specify

git checkout --ours -- <paths>
# or
git checkout --theirs -- <paths>

From the git checkout docs

git checkout [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <paths>...

--ours
--theirs
When checking out paths from the index, check out stage #2 (ours) or #3 (theirs) for unmerged paths.

The index may contain unmerged entries because of a previous failed merge. By default, if you try to check out such an entry from the index, the checkout operation will fail and nothing will be checked out. Using -f will ignore these unmerged entries. The contents from a specific side of the merge can be checked out of the index by using --ours or --theirs. With -m, changes made to the working tree file can be discarded to re-create the original conflicted merge result.

More Related Contents:

  1. I ran into a merge conflict. How can I abort the merge?
  2. When do you use Git rebase instead of Git merge?
  3. Git workflow and rebase vs merge questions
  4. What is the difference between merge –squash and rebase?
  5. Git merge left HEAD marks in my files
  6. How to squash all git commits into one?
  7. Edit the root commit in Git?
  8. Insert a commit before the root commit in Git?
  9. How to remove/delete a large file from commit history in the Git repository?
  10. How to git rebase a branch with the onto command?
  11. How to inject a commit between some two arbitrary commits in the past?
  12. Rebasing a Git merge commit
  13. Squash the first two commits in Git? [duplicate]
  14. How to rebase local branch onto remote master
  15. git remove merge commit from history
  16. When git rebasing two branches with some shared history, is there an easy way to have the common history remain common?
  17. How to identify conflicting commits by hash during git rebase?
  18. Git rebase fails, ‘Your local changes to the following files would be overwritten by merge’. No local changes?
  19. How do I squash two non-consecutive commits?
  20. How do I select a merge strategy for a git rebase?
  21. How do I git rebase the first commit?
  22. Git interactive rebase without opening the editor
  23. Remove commit for good
  24. git rebase: “error: cannot stat ‘file’: Permission denied”
  25. Git: How to rebase to a specific commit?
  26. git rebase merge conflict
  27. How to know if there is a git rebase in progress?
  28. Git rebase branch with all parent branches (or dependent sub-branches)
  29. What does “Auto packing the repository for optimum performance” mean?
  30. Git rebase –preserve-merges fails

Leave a Comment