How Do I configure my bamboo branch builds for merging?

Hey guys, I'm a little confused about bamboo configuration. Here's what I wish to accomplish in a basic gitflow:

  • Pull all branches except for master/dev on change and run: unit tests. If they succeed they will be manualy merged into dev.
  • Get dev branch, run unit tests. If they succeed automaticaly merge into master
  • Get master branch on change, run unit tests and if they succeed > build multiple elements such as API, Patches etc..

I can't seem to figure out how to do this.

If I make a plan that simply unit tests and then apply it to all branches (present and to come). I can't tell it to only merge the dev into the master..( Or I can't seem to figure out how). It looks like my only option is to merge all current branches into the master on success.

If I make a master build plan then the dev branch fails on the building phases (as is expected and therefore never reaches success/merge

Any help would be appreciated.

1 answer

1 accepted

This widget could not be displayed.

> I can't tell it to only merge the dev into the master..

You can enable merge configuration for each branch separately.

Go to Plan Configuration. On the left you have list of all plan branches. Click on the 'dev' branch. On the 'branch details' tab click 'Branch merging enabled' and select 'Gatekeeper'.

Suggest an answer

Log in or Sign up to answer
Atlassian Summit 2018

Meet the community IRL

Atlassian Summit is an excellent opportunity for in-person support, training, and networking.

Learn more
Community showcase
Posted 10 hours ago in New to Jira

Are you planning to trial, or are currently trialling Jira Software? - We want to talk to you!

Hello! I'm Rayen, a product manager at Atlassian. My team and I are working hard to improve the trial experience for Jira Software Cloud. We are interested in   talking to 20 people planning t...

32 views 1 0
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