search

aleksandr-m / gitflow-maven-plugin

The Git-Flow Maven Plugin supports various Git workflows, including GitFlow and GitHub Flow. This plugin runs Git and Maven commands from the command line.
https://aleksandr-m.github.io/gitflow-maven-plugin/
Apache License 2.0
493 stars 181 forks source link

Option to merge HOTFIX to DEV when on SUPPORT branch #209

Open dkirchner-qc opened 4 years ago

dkirchner-qc commented 4 years ago

With our release schema we would create a support branch every release. We would only increment the bugfix version on the support branch. That way we can easily fix old versions and let it die when all customers have moved up (its their choice).

For a fix we would do a hotfix on the support branch. After that we need to manually cherry pick the changes to our development branch.

Is it possible to get an option to merge the changes into the dev branch, like it is now per default when you do a hotfix on the master?

aleksandr-m commented 4 years ago

@dkirchner-qc Do you want to merge to the support and the development branches?

dkirchner-qc commented 4 years ago

Hello @aleksandr-m, yes thats right.