4 ms·Better Git conflict resolution between binaries with --theirs and --ours3 points by kevinold 18y agoUse "git checkout --theirs" and "git checkout --ours" to resolve binary conflicts in merges.