Clarification about Automatic merge

Question

Good day,

I have branches structure

-DEV

-PROD

-bug/

-bb-01

-feature/

-ff-01

-releases/

-2018.01

-2018.02

Settings:

DevBranch: DEV

ProdBranch: PROD

BranchPrefixes: default (except of: 'bug' instead of 'bugfix')

My Steps:

1. Create branch releases/2018.01 (based on prod)

2. Create branch bug/bb-01 (based on 2018.01) and do some changes

3. Create branch feature/ff-01 (based on 2018.01) and do some changes

4. Create branch releases/2018.02 (based on 2018.01)

5. Merge branch bug/bb-01 to 2018.02

6. Merge branch bug/bb-01 to PROD

I need automatic merge from 2018.02 or PROD to feature/ff-02, but I do not see any actions from butbucket. What I did wrong?

Aliaksei Prybytkouski · Answer

Hi @Baskar Annamalai

Thank you for reply!

Does it check only branch names or also it check pom file (version, for maven projects)

Another way, is it possible:

we have releases 5.0; 5.1; 5.2

We found in version 5.2 big bug, which required couple of month for development.

I create bug1.1 from release 5.2

we created new release version 5.3 (from different features)

Now I need automatic merge release version 5.3 to bug1.1

is it possible?

I mean we do not stop releases when we have open bugs. I want that all bug\feature branches have actual code and they should have latest release changes.

Baskar Annamalai · Answer

Hi @Aliaksei Prybytkouski

The automatic merging expects the following Conditions for automatic merging. Do view the following example:

Just assume this case: Bitbucket Server have multiple releases 5.0; 5.1; 5.2; 5.3; 5.4 5.5.

* All of these are considered as release came out of the development branch and the latest release is 5.5.

* Assume there is a bug related to security that required to be patched. Since all the 5.X is supported then all of this required to be fixed

* The patch is known as bug1.1 . This bug will be merged into release/5.0

* Create a pull request for bug1.1 to release/5.0.

* Upon merging the bug1.1 to release/5.0, all the other branches will be merged automatically with the bug1.1

This is the intended function of the automatic merging.
(!) Merge does not work in a backward manner, only sequence upwards.

Regards.