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
495 stars 182 forks source link

gitflow:hotfix-finish does not always merge to develop #210

Open ptaylor opened 4 years ago

ptaylor commented 4 years ago

A hotfix-finish will skip merging to develop if a release branch exists. I had a case where a release-finish failed during the merge to develop which left the release branch around. This means that the hotfix changes could be missed. Would you consider always merging to develop and the release branch (expect when skipMergeDevBranch is true) or adding an alwaysMergeDevBranch option?

vivekmalhotragithub commented 4 years ago

we also have a use-case when we would like to keep release branch around and still merge hotfix branches to develop. when can we expect a fix for it?

Andycharalambous commented 5 months ago

We also have need of being able to always merge a hotfix back into develop.