Git Merge conflicts

I can never remember how to keep the local version of a file when a git merge has a conflict. Following this blog. To keep OUR copy of the file index.html after a git merge
git reset -- index.html
git checkout ORIG_HEAD -- index.html
git commit -a