When performing a merge in git , you might see the message: warning: Cannot merge binary files: HEAD:somefile.dll vs. otherbranch:somefile.dll Auto-merging somefile.dll CONFLICT (content): Merge conflict in somefile.dll Automatic merge failed; fix conflicts...