I am trying to set merge strategy for one file in .gitattributes so when merging to develop a file content is not changed (I added to .gitattributes file line: file_name merge=ours). It works locally but when I want to do a merge with pull request it does not. Is there any way to enable it in bitbucket?
Atlassian Summit is an excellent opportunity for in-person support, training, and networking.Learn more
Hello Community! My name is Claire Maynard, and I’m a Product Marketing Manager on the Bitbucket team. I’m interested in hearing what advice or tips you have for new users getting started on ...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs