gitflow-maven-plugin icon indicating copy to clipboard operation
gitflow-maven-plugin copied to clipboard

Published 20 hours ago • verified publisher icon aleksandr-m

gitflow:hotfix-finish does not always merge to develop

Open ptaylor opened this issue 5 years ago • 2 comments

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?

ptaylor avatar Dec 06 '19 15:12 ptaylor

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?

vivekmalhotragithub avatar Sep 22 '20 19:09 vivekmalhotragithub

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

Andycharalambous avatar Apr 29 '24 18:04 Andycharalambous