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 avoided through the use of a custom merge driver to always select the local copy of the file when a conflict is detected
This is done by defining a gitattributes file within the repository, and within this file defining a custom merge driver (called "ours") as such:
Then on the developers PC by running the command:
git config --global merge.ours.driver true
The global .gitconfig file on the PC then shows:
... [merge "ours"] driver = true
How can I configure Bamboo's Git capability to to observe a custom merge driver when the branch updater performs a merge?
Hi there! Shannon from Statuspage here. 👋 With Cyber Monday quickly approaching, we're looking to hear from Atlassian customers – specifically from teams who touch incident response li...
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