Missed Team ’24? Catch up on announcements here.

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

Problems with automatic branch merging

danival_calegari
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
July 29, 2019

Hi,

We have been using the following  standard for branch naming:

release/<number>  for new features for some release

release/hotfix/<release-number> for fixes in some release

 

As an example, we have the following branches:

release/7.11.18 (new features for 7.11 "family")

release/hotfix/7.11.16.00.f009 (fixes for version 7.11.16)

release/hotfix/7.11.17.00.f006 (fixes for version 7.11.17)

 

The automatic branch merging feature of Bitbucket is working fine for those branches.

 

But now we started the version 8.0.0 of the product and we have created the following branch for maintenance:

 

release/hotfix/8.0.1

 

The problem is when we merge a Pull Request with some hotfix branches before version 8.0.1, the branch of the 8.0 "family" is skipped in the branch list. The branch list presented in the "Merge pull request" dialog is the following:

 

Screenshot from 2019-07-29 18-03-16.png

Looks like the automatic branch merging feature of Bitbucket is skipping branches when the difference is in the first digit of the version.

 

I'm missing something here, so I hope someone can help out!

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events