I'm trying to setup automatic merging of the development branch into a feature branch in Bamboo as described here: https://confluence.atlassian.com/display/BAMBOO/Using+plan+branches#Usingplanbranches-Usingautomaticmerging
However, I cannot seem to set this up, since our Git repository is Stash and Bamboo tells me (on the Branches tab of the build plan configuration): "Merging is disabled for this plan branch as the default repository 'Develop' is of type 'Stash', which does not support automatic merging.". This seems ultimately weird, as underlying is simply Git and merging seems to be available for Git repositories.
So my question is: can I really not achieve automatic merging with Stash or am I just overlooking something?
I am sorry for the delay on getting back to you.
Based on the screenshots you have provided, it seems Bamboo is using JGit as capability instead of Git. Please, go to "Bamboo administration >> Build resources >> Server capabilities" and make sure you have added Git as a Capability as per following:
If you find this answer useful, I would kindly ask you to accept it so the same will be visible to others who might be facing the same issue you have inquired.
Thank you for your understanding.
Rafael P. Sperafico
Thank you for all the information.
Could you let us know what is the Default Branch associated with your repository "Applications / IBE" in Stash, please? In can find this information under "Repository >> Settings >> Repository details >> Default branch"
Rafael P. Sperafico
This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.Read more
Bamboo 5.9 will no longer be supported after June 12, 2017. What does this mean? As part of our End of Life policy, Atlassian supports major versions for two years after the first major iteratio...
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