Is there a simple way to handle binary files in git operations? I think my ideal in this case - \'merging\' of .mo files (binary .po messages) - would be to give precedence
basically this concept was nicely explain here How do I tell git to always select my local version for conflicted merges on a specific file?
and here is a bash script simplifying the steps described there https://github.com/equivalent/git_to_svn_behavior-
(steps how to run in Readme)