Concurrent hotfix branches
To support the case where a more urgent hotfix overruns a hotfix in progress, multiple hotfix branches should be allowed. This require the following:
- The version number of the hotfix must be determined at hotfix-finish (not hotfix-start)
- The hotfix need a temporary snapshot version that could be on the form
<assumed hotfix-version>-<issue>-SNAPSHOT
, e.g.1.0.1-issue_42-SNAPSHOT
(similar to named feature branches) - Allow for more than one open hotfix-branch
- When finishing a hotfix, the master must be merged to any other open hotfix branches as well as develop and potentially an open release branch (in the regular way by bumping in
pom.xml
back and forth)
Edited by Øyvind Matheson Wergeland