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
More Related Contents:
- How do I resolve merge conflicts in a Git repository?
- I ran into a merge conflict. How can I abort the merge?
- Git merge left HEAD marks in my files
- I ran into a merge conflict. How do I abort the merge?
- What’s the simplest way to list conflicted files in Git?
- What is the best (and safest) way to merge a Git branch into master?
- Is there a “theirs” version of “git merge -s ours”?
- Undo git pull, how to bring repos to old state
- When would you use the different git merge strategies?
- How to import existing Git repository into another?
- What’s the difference between ‘git merge’ and ‘git rebase’?
- How can I prevent foxtrot merges in my ‘master’ branch?
- How to resolve git error: “Updates were rejected because the tip of your current branch is behind”
- Git conflict markers [duplicate]
- How do I ‘overwrite’, rather than ‘merge’, a branch on another branch in Git?
- Git merge hotfix branch into feature branch
- Get changes from master into branch in Git
- Git merge error “commit is not possible because you have unmerged files”
- Find unmerged Git branches?
- Merging without whitespace conflicts
- Is it possible to pull just one file in Git?
- Tell git not to merge binary files but to choose
- How to keep a branch synchronized/updated with master?
- Git merge doesn’t use default merge message, opens editor with default message
- How to see commits that were merged in to a merge commit?
- Merge, update, and pull Git branches without using checkouts
- Git: Merge a Commit into a different Branch
- Telling if a Git commit is a Merge/Revert commit
- Git merge branch into master
- How to quit (not abort) a Git merge in progress keeping the changes uncommitted?