search

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.63k stars 2.66k forks source link

Multiple team members starting the same hotfix version #403

Open veloxy opened 9 years ago

veloxy commented 9 years ago

I have a problem in my team which could get rather annoying because it adds extra steps.

What basically happens is the following:

Team member 1 runs git flow hotfix start 1.0.1 and starts working on a hotfix. Team member 2 runs git flow hotfix start 1.0.1 and starts working on a hotfix.

Now both team members are working on the same hotfix versions, and once one finishes, the other is also going to have a merge commit message with the same hotfix version in it and can't push their tag (because it already exists). This adds extra steps to the process (renaming tag, changing commit message).

Are we using git-flow wrong, how do we avoid these issues?

jrial commented 8 years ago

Same issue here; the most logical solution would be to have a git flow hotfix rename command to fix up the version number before finishing the hotfix if a hotfix with the same version already exists.

willgopublic commented 7 years ago

seems related to https://github.com/nvie/gitflow/pull/115 .. ?