I just did a 'git merge' with another branch and I have a merge conflict. I'm happy to lose my changes in preference to the changes on the other branch.

Well, as with all things, there is a simple git command for this...

git checkout --theirs path/to/file

Too easy.