How to prevent certain files from being automerged?

[Martin Belley-Charbonneau]

Automatic Merge Conflict are causing us a bit of trouble. We have files containing per-branch information that must stay different between releases branch and master. On each merge, Bitbucket try to merge the version file and fails, causing an automatic merge conflict.

We tried:

• Putting the file in .gitignore
•  .gitattributes merge=ours

But Bitbucket doesn't seem to take them into account. Before developing a Plugin, is there a way to prevent this?

[Gonchik Tsymzhitov]

I did no find, only custom solution