Git: Fixing merge conflicts when you want to resolve by taking theirs

git checkout --theirs foo/bar.java
git add foo/bar.java
see: http://stackoverflow.com/questions/10697463/resolve-git-merge-conflict-accepting-their-changes