nvie / gitflow

Git extensions to provide high-level repository operations for Vincent Driessen's branching model.
http://nvie.com/posts/a-successful-git-branching-model/
Other
26.6k stars 2.66k forks source link

The version order problem when multiple hotfix/release branches are created #6392

Closed chrisyue closed 5 years ago

chrisyue commented 7 years ago

If a small bug is found on the production, then a hotfix branch is created, then bump the version, lets say, to 1.0.1 at once in readme, then continue to fix the bug.

In the meanwhile, an emergency bug is found on the production, then a hotfix branch is created and the version is bumped to 1.0.2, because 1.0.1 is already taken.

The 1.0.2 is fixed quickly, however, the 1.0.1 is still under development, so I can only wait for the 1.0.1 finishing then merge the 1.0.1 and tag it then merge 1.0.2 and tag it, or I merge 1.0.2 and tag it first, and merge 1.0.1 and tag it after 1.0.2. Both of them don't feel right.

why does git flow suggest bumping the version at once after creating the branch? Isn't it better bumping the version after branche is finished and rebased?

chrisyue commented 5 years ago

no reply, issue closed