We have multiple release branches with their own environmental properties.
Release 1 goes to Release 2 then goes to Release 3 and then to master.
Regarding environments and versioning we have certain files in each of these release branches which are specific to that branch.
For example I update my database properties or release versions in Release 1 and push in release 1 branch, this auto merges to Release 2. This actually creates a conflict as Release 2 has its own set of values for these properties.
Ideally I want to exclude these files from auto merges.
I would want to preserve release specific versions of certain files.
I don't believe .gitignore helps here since I want to update and track the changes to these files. I just want them to stay in a single branch.
Any help/points appreciated. Thanks in advance.
Hey Community! We’re willing to wager that quite a few of you not only use Bitbucket, but administer it too. Our team is excited to share that we’ll be releasing improvements throughout this month of...
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