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

git flow release finish not merging back into develop #35

Open
IncubuzzCC opened this issue Nov 19, 2019 · 5 comments
Open

git flow release finish not merging back into develop #35

IncubuzzCC opened this issue Nov 19, 2019 · 5 comments

Comments

@IncubuzzCC
Copy link

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?

@deiberchacon
Copy link

deiberchacon commented Nov 19, 2019

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

@p-kono
Copy link

p-kono commented Dec 10, 2019

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

@anhthang
Copy link

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

@ktzsolt
Copy link

ktzsolt commented Aug 30, 2021

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

@Serhioromano
Copy link

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.

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

6 participants