Use "git checkout --theirs" and "git checkout --ours" to resolve binary conflicts in merges.
Better Git conflict resolution between binaries with --theirs and --ours(kevinold.com)3 points by kevinold 17 years ago | 0 commentsUse "git checkout --theirs" and "git checkout --ours" to resolve binary conflicts in merges.No comments yet