Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Automatic merging to release branch without version number in name

Our team has the following setup:

  • "master" is our production branch, deployed to production environment
  • "develop" is our development branch, deployed to development environment
  • "release" is our release candidate (RC) branch, deployed to staging environment

We enabled Bitbucket's automatic merge feature and configured the branching model:

 

bitbucket-branching-model.png

Our problem is that hotfixes on "master" are only being automatically merged into the "develop" branch, but not into the "release" branch.

The automatic merge into our RC worked when we were still creating "release" branches with a version in the name (e.g. "release/1.2.3"). But we decided to have a stable branch for the RC instead, so we don't have to create a new branch everytime we want to create a new RC.

Is there a workaround to make Bitbucket do the automatic merge of hotfixes into our RC although it can't determine an ordering for a branch named "release"?

We are still running Bitbucket 4.14.1, but (hopefully) it will be upgraded by our infrastructure department sometime soon...

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Posted in Bitbucket

How do you use the Bitbucket-Jira integration? How does it help your team?

Hey everyone, over the past year, we've added several new features on how you can use Bitbucket and Jira together. We'd love to know how you'll are using the integration and how it's helping your t...

158 views 0 2
Join discussion

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you