Hi Git community,
I have two branches master and develop. Each branch contains a same file named "db.config" having a seperate db credentials for production(master) and staging(develop).
Master branch also have .gitattributes file in which i defined a merge=ours strategy for db.config file
When i merge develop into master branch by creating a pull request then changes in develop branch also goes to master after merge. It looks like .gitattributes doesnot work for me.
Does anyone know how i get rid out of this?
Hello dear ACE, It's an exciting context of #Atlympics for all community leader's. Have you ever wondered in the life of a person their comes a day, a month, a year working from home and: taking fu...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events