Hacker News new | ask | show | jobs
Better Git conflict resolution between binaries with --theirs and --ours (kevinold.com)
3 points by kevinold 6319 days ago
Use "git checkout --theirs" and "git checkout --ours" to resolve binary conflicts in merges.