At our company we use Jira, Bitbucket and Bamboo. 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 via pull-request
- hotfix-branches = new hotfixes based on master-branch merged into develop and master via pull-request
Our versioning system works like the following:
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?