Better Git conflict resolution between binaries with --theirs and --ours

3 points by kevinold 17 years ago · 0 comments · 1 min read

Use "git checkout --theirs" and "git checkout --ours" to resolve binary conflicts in merges.

No comments yet.