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

release-finish should merge master, not the release branch, into develop #321

Closed
CidTori opened this issue Dec 6, 2021 · 5 comments
Closed

Comments

@CidTori
Copy link

CidTori commented Dec 6, 2021

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

@CidTori
Copy link
Author

CidTori commented Dec 6, 2021

Moreover, this comment is misleading, since it is not the current behaviour.

@aleksandr-m
Copy link
Owner

Seems same as #213 ?
I remember there was some issue with avoiding direct commits to master.

@CidTori
Copy link
Author

CidTori commented Dec 7, 2021

Yes, it's the same.
I see no objection in #213, #289 or #291.
Moreover, it's about a merge commit on develop, not a direct commit on master.
(By the way, PR #291 isn't ideal either: it back-merges the release branch AND the release tag into develop, but if you do the latter, you don't need the former. See my SO answer for the full story and references.)

@gbaso
Copy link

gbaso commented Dec 11, 2021

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.

@aleksandr-m
Copy link
Owner

Resolved in da263d3

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

3 participants