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


How do I resolve a git merge conflict in favor of pulled changes?

I want to remove all conflicting changes from a working tree without having to go through all of the conflicts with git mergetool, while keeping all conflict-free changes. Preferably, I want to do this while pulling, not afterwards.


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

Git push rejected after feature branch rebase

Given a commit id, how to determine if current branch contains the commit?