I’m working on an application distributed with few brands. The differences between these brands is just logo images and some styles resource but all other contents are identical.
All brand versions are stored in different branches of a git repository.

I’m looking for some way to “fix” just these custom resources through all branches. In other words, I will need to often merge all branches with the main one, but I need to keep unmodified the brand resources even if the file seems not updated and a standard fast forward merge will overwrite it.

Is there any way to prevent file merge between branches in git?