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 Posts:
- How to resolve merge conflicts in a Git repository
- Git error on commit after merge – fatal: cannot do a partial commit during a merge
- What is the best (and safest) way to merge a Git branch into master?
- Undo a Git merge that hasn’t been pushed yet
- Git merge hotfix branch into feature branch
- Abort a Git Merge
- How can I merge multiple commits onto another branch as a single squashed commit?
- How can I merge multiple commits onto another branch as a single squashed commit?
- The following untracked working tree files would be overwritten by merge, but I don’t care
- The following untracked working tree files would be overwritten by merge, but I don’t care
- Is there a “theirs” version of “git merge -s ours”?
- .gitignore and “The following untracked working tree files would be overwritten by checkout”
- The following untracked working tree files would be overwritten by merge, but I don’t care
- .gitignore and “The following untracked working tree files would be overwritten by checkout”
- Is there a “theirs” version of “git merge -s ours”?
- Is it possible to pull just one file in Git?
- How to resolve git status “Unmerged paths:”?
- How to keep a branch synchronized/updated with master?
- Found a swap file by the name
- Is there a git-merge –dry-run option?
- Git pull – Please move or remove them before you can merge
- How do I check out a remote Git branch?
- How do I delete a Git branch locally and remotely?
- How do I use ‘git reset –hard HEAD’ to revert to a previous commit? [duplicate]
- What is git tag, How to create tags & How to checkout git remote tag(s)
- How do I delete a Git branch locally and remotely?
- How do I rename a local Git branch?
- What does ‘–set-upstream’ do?
- What does ‘–set-upstream’ do?
- Difference between “git add -A” and “git add .”
- Git: Message ‘src refspec master does not match any’ when pushing commits in Git
- Git: Message ‘src refspec master does not match any’ when pushing commits in Git
- error: src refspec master does not match any
- What does cherry-picking a commit with Git mean?
- How to cherry pick from 1 branch to another
- How to Git stash pop specific stash in 1.8.3?
- How to use Git Revert
- How do I undo the most recent local commits in Git?
- How do I revert a Git repository to a previous commit?
- How to merge branch to master?
- How do I force git pull to overwrite everything on every pull?
- What happens when I do git pull origin master in the develop branch?
- How do I properly force a Git push?
- fatal: Not a git repository (or any of the parent directories): .git [duplicate]
- How can I switch to another branch in git?
- How to remove local (untracked) files from the current Git working tree
- Squash my last X commits together using Git
- Git refusing to merge unrelated histories on rebase
- Git submodule update
- How to apply a patch generated with git format-patch?
- What is the `git restore` command and what is the difference between `git restore` and `git reset`?
- What does ‘git merge –abort is equivalent to git reset –merge when MERGE_HEAD is present.’ of Git merge man page mean?
- What does ‘git blame’ do?
- What is the difference between git push origin and git push origin master
- GitHub: Permission denied (publickey). fatal: Could not read from remote repository
- Git fetch remote branch
- How to delete a remote tag?
- Updates were rejected because the tip of your current branch is behind its remote counterpart
- Updates were rejected because the tip of your current branch is behind its remote counterpart
- git stash apply version
- How to modify existing, unpushed commit messages?
- How do I clone a specific Git branch? [duplicate]
- Git pushing to remote branch
- How to revert a merge commit that’s already pushed to remote branch?
- What is Git pruning?
- Git pushing to remote branch
- git – remote add origin vs remote set-url origin
- How do I undo ‘git add’ before commit?
- Git: Message ‘src refspec master does not match any’ when pushing commits in Git
- GitHub Error Message – Permission denied (publickey)
- Git fetch remote branch
- How can I see the differences between two branches?
- How to upgrade Git on Windows to the latest version
- Reset local repository branch to be just like remote repository HEAD
- How do I push a new local branch to a remote Git repository and track it too?
- Practical uses of git reset –soft?
- Need to reset git branch to origin version
- How do I push a new local branch to a remote Git repository and track it too?
- Updating a local repository with changes from a GitHub repository
- How do I remove a submodule?
- LF will be replaced by CRLF in git – What is that and is it important? [duplicate]
- git: fatal: Could not read from remote repository
- Git push results in “Authentication Failed”
- What does “Changes not staged for commit” mean
- github changes not staged for commit
- Git : fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists
- Windows git “warning: LF will be replaced by CRLF”, is that warning tail backward?
- git: fatal: Could not read from remote repository
- Git push results in “Authentication Failed”
- What does “Changes not staged for commit” mean
- Download single files from GitHub
- Git error: “Please make sure you have the correct access rights and the repository exists”
- How do I push a new local branch to a remote Git repository and track it too?
- How do I update Homebrew?
- Git error when trying to push — pre-receive hook declined
- Undoing a git rebase
- How do you push a tag to a remote repository using Git?
- How do I pull my project from github?
- Ignoring directories in Git repositories on Windows
- Remove files from Git commit