Git: merge after pull fails and I want to accept the file(s) on the remove repository (and not my local one(s))

 
$ git checkout --theirs filename

Conflict is resolved! Not commit changes:

 
$ git add filename
$ git commit

References

• http://kevinold.com/2009/02/24/better-git-conflict-resolution-between-binaries-with-theirs.html
• http://kernel.mirrors.pair.com/pub/software/scm/git/docs/user-manual.html#resolving-a-merge