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

Before Git pull

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

In the default repository

git pull -X theirs

Git pull already performed and you’re in a conflicted state

git checkout --theirs path/to/file

Source: https://stackoverflow.com/questions/10697463/resolve-git-merge-conflicts-in-favor-of-their-changes-during-a-pull

Don’t miss these tips!

We don’t spam! Read our privacy policy for more info.

Open chat
Powered by