Better Git conflict resolution between binaries with --theirs and --ourskevinold.com3 pointskevinold17 years agoUse "git checkout --theirs" and "git checkout --ours" to resolve binary conflicts in merges.