Hotfix finish should not necessarly bump to next development version #230
Comments
rostskadat
pushed a commit
to rostskadat/gitflow-maven-plugin
that referenced
this issue
Apr 30, 2020
rostskadat
pushed a commit
to rostskadat/gitflow-maven-plugin
that referenced
this issue
Apr 30, 2020
rostskadat
pushed a commit
to rostskadat/gitflow-maven-plugin
that referenced
this issue
Apr 30, 2020
rostskadat
pushed a commit
to rostskadat/gitflow-maven-plugin
that referenced
this issue
May 1, 2020
…OM commit After the user has solved the conflicts that appeared during the first hotfix-finish, it should be possible to restart the hotfix-finish without failing. The first fix is that if we are tagging (skipTag=false) we should allow the user to avoid failing. Since the tagging happened on master before possible merge fail on develop, we would fail when tagging the second time around. The second failure fix is to make sure that the development version is not incremented indiscriminately. There is one last problem, which is not solved yet: the fact that if we have a conflict when merging on develop, we should backtrack the commit were we set the version to hotfix branch...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Description:
Imagine you have a project with a
masterbranch whose last release is1.0and a development branch whose current branch is1.1-SNAPSHOT. Doing a succession of hotfix-start / hotfix-finish with the successive version1.0.1,1.0.2...1.0.nwill erroneously increment the development snapshot to1.2-SNAPSHOT,1.3-SNAPSHOT, etc..Steps To Reproduce:
1- Start and then finish several hotfix on the TestProject
2- Each time you finish the hotfix the development version is also incremented.
Expected Result:
I would expect the
hotfix-finishgoal to:Consider that if the hotfix version is less than the development version then the development should not be bumped to the next development version.
The text was updated successfully, but these errors were encountered: