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?
Badges are a great way to show off community activity, whether you’re a newbie or a Champion.Learn more
Hi Community, I'm Julia and I'm on the Jira Software Cloud marketing team! We're looking for companies or teams using Bitbucket Cloud and Jira Software Cloud. If your team fits the t...
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