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

How do I get automatic merge to master?

cricket November 13, 2015

I have automatic merging enabled and it works, but it doesn't auto-merge to master. So I have a setup like this:

  • bugfix/MyBranch
  • release/1.0-foo
  • release/1.1-foo
  • release/1.5-foo
  • release/2.0-foo

If I do a merge from MyBranch to any of the release branches, it auto-merges to the next releases based on the sorting, but does not merge to master.

I've been reading this page and I think I have it set up right, but it doesn't appear to work:

https://confluence.atlassian.com/display/STASH0311/Using+pull+requests+in+Stash#UsingpullrequestsinStash-Mergingapullrequest

 

1 answer

0 votes
Ben Humphreys
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
November 13, 2015

Hi,

If you go to Settings->Branching Model the "Development" branch should be set to either "master" or "Use Default Branch". Automatic merging will merge to this development branch after the release branches.

If this is set to "Use Default Branch" then please check Settings->Repository Details and ensure "Default Branch" is set to "master".

Hope this helps!

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events