resolve_conflicts_involving_binary_files.md

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>

References

• GitHub