One thing that I liked about subversion, when it came to merge conflicts, was the ability to easily say "I expected this conflict. Take all of the incoming remote changes, discard my changes, and mark this file as resolved." Or vice versa.
Apparently, it's easy to say the same thing in git:
keep either file in merge conflicts