Better Git conflict resolution between binaries with --theirs and --ourskevinold.com·3 pts·kevinold·0