The Atlassian Community Forums are currently in read-only mode. We will be relaunching on a new platform on September 22 (read more here). We apologize for the extended downtime. For concerns or questions, please email communitymanagers@atlassian.com. See you on the other side, on the new Atlassian Community Forums! :)
×Community resources
Community resources
Community resources
Automatic Merge: Ignore some of the branch specific file changes
Hello,
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.
0 answers
Comments for this post are closed
Community moderators have prevented the ability to post new answers.