Handling git-Flow hotfix-branch in Bamboo

Hello everyone,

At our company we use Jira, Bitbucket and Bamboo to make our daily work a lot easier. Our repository is organized in the git-flow schema:

develop-branch = Application code for testing (aka Release Candidate)
master-branch = Application code running live
feature-branches = new components based on actual dev-Branch merged back after finish
hotfix-branches = new hotfixes based on master-branch merged into develop and master after finish

Our versioning system works like the following:

Untitled Diagram.png

Now I'm trying to integrate our structure into Bamboo. I created a plan triggered by changes into the dev-branch containing two stages:

1: Develop - Build develop -> deploy after finish
2: (manual) Production - Build master -> deploy after finish

That works fine with feature Branches. How do I handle hotfix branches? Do I need an additional plan or is it possible to create a single plan to cover the whole process?

 

Cheers,

Chris

2 answers

I have automated and implemented a similar structure along with release branches.

It would be helpful if you can provide the type of application you are building (maven, angular/node) and also some more details on how you are building the feature branches.

From what I see, if you're using JIRA to create hotfix and pull requests to manually merge hotfix to master and develop after testing is complete, you don't really need additional plan.

Suggest an answer

Log in or Join to answer
Community showcase
Renan Battaglin
Published May 18, 2017 in Bamboo

FAQ: How to Upgrade Bamboo Server

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...

1,066 views 0 5
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
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot