vscode-gitflow icon indicating copy to clipboard operation
vscode-gitflow copied to clipboard

git flow release finish not merging back into develop

Open IncubuzzCC opened this issue 5 years ago • 5 comments

Trying to use the extension to do a release for the first time; The release branch did not merge back into develop during finish and it was gone.

This is something expected as using the git-flow command git flow release finish xxx does exactly that.

I had to manually un-delete and merge the branch into develop.

git checkout -b release/xxx 123456789a
git checkout develop 
git merge --no-ff release/xxx 
git branch -d release/xxx 

Is this a bug or an expected behaviour?

IncubuzzCC avatar Nov 19 '19 17:11 IncubuzzCC

Same issue here. The release branch was deleted after merging it back into master. Master and develop should be at the same point after release.

image

deiberchacon avatar Nov 19 '19 17:11 deiberchacon

Thanks for your description, @pddm. It's the same here with Windows 10 Pro, VSC 1.40.2 and gitflow 1.2.1.

p-kono avatar Dec 10 '19 09:12 p-kono

is this issue still occur? I never face the issue like this with any git version, vscode (I'm using macOS)

anhthang avatar May 12 '20 10:05 anhthang

still an issue, also the release branch wasn't even deleted for me

ktzsolt avatar Aug 30 '21 06:08 ktzsolt

As I understand it works, release finish first create tag, then merge to master and then FastForward develop branch to master. After release finish master and develop are not the same. Then both must have changes in release, but develop branch might have mor changes than master.

Anyway, looks like this project is abandoned form 2018. Try serhioromano.gitflow extension.

Serhioromano avatar Mar 14 '22 11:03 Serhioromano