Better Git conflict resolution between binaries with --theirs and --ours
http://kevinold.com/2009/02/24/better-git-conflict-resolution-between-binaries-with-theirs.htmlUse "git checkout --theirs" and "git checkout --ours" to resolve binary conflicts in merges.