It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Configuring a git merge driver for Bamboo to use during branch updater operations?

Deleted user Aug 02, 2016

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:

version.txt merge=ours

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?

1 answer

I am searching for a solution to the exact same problem - any joy?

Suggest an answer

Log in or Sign up to answer
This widget could not be displayed.
This widget could not be displayed.
Community showcase
Published yesterday in Confluence

Confluence CVEs and common questions

Two vulnerabilities have been published for Confluence Server and Data Center recently: March 20, 2019 CVE-2019-3395 / CVE-2019-3396 April 17, 2019 CVE-2019-3398 The goal of this article is...

61 views 0 9
Read article

Atlassian User Groups

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!

Find my local user group

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

Groups near you