Today I Learned: collection of notes, tips and tricks and stuff I learn from day to day working with computers and technology as an open source contributor and product manager

View project on GitHub

Resolve conflicts in binary files

Sometimes you get caught in the dilemma of a conflict in a binary file.

$ git checkout --ours <binaryfile>
$ git checkout --theirs <binaryfile>