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:
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??
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.
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. ;)
As a project manager, I have discovered that different developers want to bring their previous branching method with them when they join the team. Some developers are used to performing individual wo...
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!
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