from
Hacker News
Top
New
Better Git conflict resolution between binaries with --theirs and --ours
by
kevinold
on 2/24/09, 11:42 PM with 0 comments
Use "git checkout --theirs" and "git checkout --ours" to resolve binary conflicts in merges.