gitflow icon indicating copy to clipboard operation
gitflow copied to clipboard

when finish a hotfix, the hotfix was not merged into develop, but new created tag merged

Open sunjinopensource opened this issue 6 years ago • 1 comments

When i use git flow hotfix finish v1.0, the new created tag v1.0 was merged into develop but not hotfix/v1.0

sunjinopensource avatar Oct 17 '17 09:10 sunjinopensource

My guess is that you installed gitflow via a package manager on a Debian- or FHEL-based system, or through an embedded integration in SourceTree or the like. This project is abandoned, so they use the actively-mainetained https://github.com/petervanderdoes/gitflow-avh version.

Try git flow version and see what you get.

In the AVH version, this is the intended behavior. It actually does align with what @nvie did in this repository, though he never published it. https://github.com/nvie/gitflow/issues/49

This change to the model exists solely for the sake of git describe. I have never found that an acceptable tradeoff for corrupting and confusing the model, and @petervanderdoes does not want to make this behavior optional, so my team has been stuck using the old, abandoned 0.4.1 version forever, sadly.

gsprdev avatar Feb 08 '18 16:02 gsprdev