Resolve Git merge conflicts in favor of their changes during a pull

by 
git pull -s recursive -X theirs <remoterepo or other repo>

Or, simply, for the default repository:

git pull -X theirs

If you’re already in conflicted state…

git checkout --theirs path/to/file

Related Contents:

  1. How do I resolve merge conflicts in a Git repository?
  2. I ran into a merge conflict. How do I abort the merge?
  3. How to undo a git merge with conflicts
  4. What’s the simplest way to list conflicted files in Git?
  5. Git error on commit after merge – fatal: cannot do a partial commit during a merge
  6. How do I use vimdiff to resolve a git merge conflict?
  7. Git merge left HEAD marks in my files
  8. hint: after resolving the conflicts, mark the corrected paths
  9. Undo a Git merge that hasn’t been pushed yet
  10. How can I selectively merge or pick changes from another branch in Git?
  11. How can I merge multiple commits onto another branch as a single squashed commit?
  12. Is there a git-merge –dry-run option?
  13. Merge development branch with master
  14. How to cherry-pick a range of commits and merge them into another branch?
  15. Merge, update, and pull Git branches without using checkouts
  16. How to import existing Git repository into another?
  17. Git conflict markers [duplicate]
  18. How do I ‘overwrite’, rather than ‘merge’, a branch on another branch in Git?
  19. Git merge errors
  20. Find unmerged Git branches?
  21. Choose Git merge strategy for specific files (“ours”, “mine”, “theirs”)
  22. How can I configure KDiff3 as a merge tool and diff tool for git?
  23. git stash -> merge stashed change with current changes
  24. Restart/undo conflict resolution in a single file
  25. Merging without whitespace conflicts
  26. How to use Visual Studio Code as the default editor for Git MergeTool including for 3-way merge
  27. can’t push to branch after rebase
  28. How to update my working Git branch from another branch (develop)?
  29. How Do I ‘git fetch’ and ‘git merge’ from a Remote Tracking Branch (like ‘git pull’)
  30. Have Git Select Local Version On Merge Conflict on a Specific File?
  31. GIT warning: too many files skipping inexact rename detection
  32. How to merge all files manually in Git?
  33. Merging changes from master into my branch
  34. What I can do to resolve “1 commit behind master”?
  35. Git pull – Please move or remove them before you can merge
  36. How to merge two branches with different directory hierarchies in git?
  37. How to resolve git error: “Updates were rejected because the tip of your current branch is behind”
  38. git: merge two branches: what direction?
  39. How to prevent many git conflicts when rebasing many commits?
  40. When to use the ‘–no-ff’ merge option in Git
  41. Removing/undoing a merge on Sourcetree
  42. Git rebase (Merge Squash) my feature branch onto another branch
  43. What exactly is a merge conflict?
  44. Git merge branch into master
  45. Git merge after fetch – how, exactly?
  46. How to make git merge handle uncommitted changes to my working tree?
  47. How do I resolve a conflict after git pull?
  48. Resolve merge conflicts: Force overwrite all files
  49. Are merges in Git symmetric?
  50. How to re-merge a file in the git?

Leave a Comment