search

petervanderdoes / gitflow-avh

AVH Edition of the git extensions to provide high-level repository operations for Vincent Driessen's branching model
http://nvie.com/posts/a-successful-git-branching-model/
Other
5.42k stars 528 forks source link

release finish does not merge back to develop #410

Open SassNinja opened 5 years ago

SassNinja commented 5 years ago

I've moved from gitflow to gitflow-avh since the former is not supported anymore and I was facing an issue. Unfortunately I've got the same problem with gitflow-avh :/

My workflow is:

What I expect is the release branch gets merged into both, master and develop branch. The former happens but there's no back merge to develop! To see the changes done in the release branch I have to merge release into develop myself.

Is there any way to enable back merge to develop? Or has my use case not been considered?

petervanderdoes commented 5 years ago

When you finish a release it is merged into the master and the master or tag is merged back into the develop branch. This is default behavior unless you explicitly state not to do a backmerge.

SassNinja commented 5 years ago

This is default behavior unless you explicitly state not to do a backmerge.

That's exactly what I expected and what didn't happen!

However while writing step-by-step instructions to reproduce the issue I realized I didn't notice two error messages while finishing the release:

fatal: no tag message?
Fatal: Tagging failed. Please run finish again to retry.

When I specify a tag message it works as expected. Imo the release branch name should be taken as tag message by default if none specified instead of breaking the whole process – what do you think?