How to auto-merge Stash develop branch in feature (plan) branches in Bamboo

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?

5 answers

1 vote

Hello Pascal,

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:

bamboo.git.capability.png

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.

Kind regards,
Rafael P. Sperafico
Atlassian Support

0 votes

Which Bamboo version do you use? Can you please post the screenshot of your plan repository configuration?

We're using version 5.7.2. Here are some screen shots of our configuration:

Repositories.png

Branches.png

Triggers.png

 

Thanks for your help!

0 votes

Hello Pascal,

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"

Kind regards,
Rafael P. Sperafico
Atlassian Support

Hi Rafael,

That is "develop". Here a screenshot of that page and one of the branching model:

Settings.png

Branching_Model.png

 

Thanks,

Pascal

Suggest an answer

Log in or Sign up to answer
Community showcase
Posted Monday in Confluence

Organizing your space just got easier - Page Tree Drag & Drop is here

Hi Community! I’m Elaine, Confluence Product Manager. You may have read my earlier post about page tree in space navigation sidebar. I'm excited to share another improvement that helps you organize ...

63 views 3 2
Join discussion

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