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

Feature not updated on successful master

Hans Leautaud November 10, 2015

Hi,

We're using the branch updater functionality in Bamboo. However, according to the documentation, the master branch (when successful) should be merged into all feature branches.

This is not the case. Our feature branch is failing, but that shouldn't matter in my opinion.

The license we're using: SEN-2207378

Branch that should be updated:

https://bestseller.jira.com/builds/browse/DMW-DM44

Hope to hear from you soon.

 

Regards

Hans

2 answers

0 votes
Hans Leautaud November 11, 2015

Hi Jaime,

Yes I did follow those instructions.

As said in the question, I do not want to merge my feature branch into the master branch. My question is:

Is the merging into the feature branch done when the master is green or when the master AND the feature branch is green?

The reason I'm asking is because I think it's the latter one whereas the documentation states that it's the first.

Hans

0 votes
Jaime S
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
November 10, 2015

Hi, Hans.

Did you follow the instructions here?

https://confluence.atlassian.com/bamboo/using-plan-branches-289276872.html#Usingplanbranches-Automaticbranchmerging

 

Also, that documentations says:

  • Optionally, changes from the feature branch can be automatically merged back to the "master" (e.g. trunk, default or mainline branch) when the build succeeds.

It seems that it must succeed. Does it merge them if they succeed?

Kind regards,
Jaime Kirch da Silveira
Atlassian Cloud Support

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events