When using the Bamboo branch updater functionality I am constantly getting failed builds due to git merge conflicts in a file that contains the application version number. On developer PC's this is ...

• Bamboo
• Question
• attribute
• bamboo
• bamboo-administration
• branch-updater
• conflict
• +1 more tag...

I have a plan that points to master by default. I have my develop branch and staging branches set to automatically update with branch updater. Is there a way to have builds on develop and staging ...

• Bamboo
• Question
• bamboo
• branch-updater
• trigger