Automatic branch merging master (hotfix) to develop?

Hello,

I just wanted to ask if it is possible,

to create a hotfix in Stash and automatically merge it into develop?

Currently we have the following branch model:

http://imgur.com/uQrhSzP

Now we created a Pull Request on the hotfix/demo_hotfix repo to master but it will only be merged into master and not into master and develop.

is there a way to merge it into master and develop??

1 answer

1 accepted

Hi Christian,

Stash currently only supports automatic merging for merging bug fixes forward through stable release branches into develop and requires that you use semantic versioning in your branch names. However, I think your use case is totally valid if you're following a "git-flow" stlye hotfix branching scheme, and I'd encourage you to raise a feature request at https://jira.atlassian.comin the Stash project.

In the meantime, you could experiment with the Stash Auto Merge plugin from Atlassian Labs. It allows you to manually specify a branch merge order. In your case specifying the pattern "master -> develop" would ensure any new commits merged by pull request to master are automatically merged onto develop, which I think would cover your hotfix case nicely.

cheers,

Tim

I asked that cause of a Atlassian Talk here: http://www.youtube.com/watch?v=WX0hLfaKsWg&feature=youtu.be&t=55m17s

The speaker said that you use the develop / master workflow, too. For Atlassian Marketplace so I thought that you could share some more secrets how you did this in stash. ;)

Haha, would you believe that's actually me speaking :) I fully agree that this would be a nice feature to support git-flow in Stash.

Oh damn. Didn't looked up the name.

Currently I raised an issue here: https://jira.atlassian.com/browse/STASH-5000

Hm yeah that would be a really nice feature. git-flow, Stash/Jira/Bamboo is awesome, even when using Python.

Edit: Oh and the talk is awesome.

btw. how do i build the stash automatic merge plugin?

Suggest an answer

Log in or Sign up to answer
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Posted Jun 06, 2018 in Bitbucket

Do you use Bitbucket Cloud and Jira Cloud? If so, let us know!

Hi Community, I'm Julia and I'm on the Jira Software Cloud marketing team!  We're looking for companies or teams using Bitbucket Cloud and Jira Software Cloud. If your team fits the t...

131 views 6 3
Join discussion

Atlassian User Groups

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

Find a group

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

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you