Git: Resolve merge conflict with binaries

To resolve merge conflicts with binary files git provides us two awesome options for git checkout

git checkout --ours -- path/to/the/binary/file

which means that we want to use the version of our binary file that is not merged in.

If you want to use the version of the file of the branch you want to merge in try:

git checkout --theirs -- path/to/the/binary/file