Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
sunjinopensource opened this issue Oct 17, 2017 · 1 comment

Comments

@sunjinopensource
Copy link

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

@gsprdev
Copy link

gsprdev commented Feb 8, 2018

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. #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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants