Thank you for that!

Although the message at the end of git status says use git checkout -- <file>, that's not it.

"If you prefer to resolve the conflict using their copy, you need to get the version of the file from the branch you were trying to merge in:

git checkout otherbranch somefile.dll"