Skip to content
Better HN
Top
New
Best
Ask
Show
Jobs
Search
⌘K
0 comments
No comments yet.
Better Git conflict resolution between binaries with --theirs and --ours | Better HN
Better Git conflict resolution between binaries with --theirs and --ours
(opens in new tab)
(kevinold.com)
3 points
kevinold
17y ago
0 comments
Share
Use "git checkout --theirs" and "git checkout --ours" to resolve binary conflicts in merges.
