You may want to set the '-diff' attribute for these files so that git will not show diffs for these, instead it will show 'Binary files differ'.
There is also '-merge', which will cause git to not attempt to merge the contents, but just ask you to pick a side.
The challenge however is then verifying the contents of these files in things like merge requests.