git flow release finish does not merge back into develop

[hartbit]

git flow release finish says "- Release branch has been back-merged into 'develop'", but it does not do it in my case. I have to manually merge master back into develop.

[jonspalmer]

but it does merge the release branch back to develop right? Not necessarily the same thing as merging master to develop.

[nvie]

I'd really love to hear some steps to reproduce this bug. I have never seen it and cannot produce it myself.

@gidogeek: Is this similar to the console gist you showed me on Twitter recently?

[hartbit]

This was some time ago, but I think I figured out what the problem was. I created a release branch, but didn't make any additional commits, because nothing was needed to bump the version number for example, and then finished it straight away. Does that help?

[johanb]

@nvie nope my issue can be found here: https://gist.github.com/958774
It reported an error about not being able to delete the branch even though the summary showed everything went fine. The merge had been performed only the deleting of the branch failed somehow.. running the command again solved it.

ps. github handle is now @johanb ;)

[troymccormick]

This is an old issue, but thought I would bring it up again as I'm running into a similar circumstance.

I'm on a Windows box (work...other wise no... :))...just to get that out of the way.

I first so the start release as normal. After making zero changes I go to do a git flow release finish 'v1.0', it hangs with this in the console:

Switched to branch 'master'
Merge made by recursive.
 0 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 test2.txt

Then nothing...just hangs. If I CTRL+C out of it, I can see the changes have been merged back, but the release branch still exists. Is there a "verbose" mode that I'm missing to see what is going on?

Thanks for the great script...I'm loving it!!! :)