Prevent merging a file from master with Git

Question

In another question it is recommended to use .gitattributes in order to keep the file tracked but not merged in different branch, but my use case below seems no

Answer 1

The custom merge driver mentioned by carleeto is illustrated in "Tell git not to merge binary files but to choose":

You can declare in a .gitattributes file the kind of merge you want:

echo yourConfigFile merge=keepMine > parentDirectory\.gitattributes