Automatic branch merging master (hotfix) to develop?

[ChristianS]

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??

[TimP · Accepted solution]

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

[ChristianS]

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. ;)

[TimP]

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.

[ChristianS]

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.

[ChristianS]

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