I am trying to merge with attributes to resolve conflict between breanches ( I have MASTER,PROD,TEST,DEV). I have some specific files like favicon.ico which is different and needed on each branch. Trying to set up .gitattributes with merge.driver but it is working not as I expect.
Here is my .gitattribute file:
public/favicon.ico merge=ours
.env merge=ours
.gitattributes merge=ours
after adding .gitattribute file I am using
git config merge.ours.driver true
on each repo but it works weaird. Sometimes it work properly and sometimes it resolving conflict overwriting my values for target branch.
Trying to work with this tutorial but it was null effects https://stackoverflow.com/questions/928646/have-git-select-local-version-on-merge-conflict-on-a-specific-file/930495#930495
