You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.
Join groupJoin the community to find out what other Atlassian users are discussing, debating and creating.
Automatic Merge Conflict are causing us a bit of trouble. We have files containing per-branch information that must stay different between releases branch and master. On each merge, Bitbucket try to merge the version file and fails, causing an automatic merge conflict.
We tried:
But Bitbucket doesn't seem to take them into account. Before developing a Plugin, is there a way to prevent this?
Hi everyone, We are looking to learn more about development teams’ workflows and pain points, especially around DevOps, integrations, administration, scale, security, and the related challeng...
Connect with like-minded Atlassian users at free events near you!
Find an eventConnect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.
Host an eventYou're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.