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

[CidTori]

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]

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

[aleksandr-m]

Seems same as https://github.com/aleksandr-m/gitflow-maven-plugin/issues/213 ? I remember there was some issue with avoiding direct commits to master.

[CidTori]

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]

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]

Resolved in da263d3f6672d0c26243c829aef4d3a457848ee6