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.
If you're already in conflicted state, and do not want to checkout path one by one. You may try
git merge --abort
git pull -X theirs