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

Heykuki News

3 points

17 years ago

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

Better Git conflict resolution between binaries with --theirs and --ours | Heykuki News