-
-
Notifications
You must be signed in to change notification settings - Fork 182
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
release-finish should merge master, not the release branch, into develop #321
Comments
Moreover, this comment is misleading, since it is not the current behaviour. |
Seems same as #213 ? |
Yes, it's the same. |
This is also the current behaviour in jgitflow. I'm evaluating a migration to gitflow-maven-plugin and it would be nice if the behaviour were similar. |
Resolved in da263d3 |
See my answer to a StackOverflow question here for the full story, but the bottom line is: you should back-merge the release tag (or master) into develop, instead of back-merging the release branch into develop, contrary to what the original article and most popular sources say, because of an issue with
git describe
.This is already the default behaviour for the most popular implementation of gitflow, gitflow-avh (default on Windows and Ubuntu for example), and it was approved by Vincent Driessen aka nvie, even if he never made it official (the links in my SO answer lead to the corresponding source code lines, issue and PR).
The text was updated successfully, but these errors were encountered: