To resolve conflits on binary files, you can checkout the remote version and your version with the `–theirs’ and `–ours’ checkout flags. This allows you to inspect both version, then write back the correct resulting file.
$ git checkout --theirs -- doc/manual.odt $ mv doc/manual.odt doc/theirs.manual.odt $ git checkout --ours -- doc/manual.odt $ mv doc/manual.odt doc/ours.manual.odt
Open and compare `theirs.manual.odt’ with `ours.manual.odt’, and save back the result into `manual.odt’.
$ git add doc/manual.odt $ git commit