title: Resolve Git merge conflicts in favor of their changes during a pull
body: <p>How do I resolve a git merge conflict in favor of pulled changes?</p>
  <p>I want to remove all conflicting changes from a working tree without having to go through all of the conflicts with <code>git mergetool</code>, while keeping all conflict-free changes. Preferably, I want to do this while pulling, not afterwards.</p>