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

Missing 'git flow release abandon' command

Open petervanderdoes opened this issue 10 years ago • 3 comments

Quote from original report by @kretes at nvie/gitflow#358

When using branching model it may happen that release is created, some commits are applied to it, but then it is abandoned - i.e. not deployed to production, but all the fixes should be back-merged to develop. I don't see a way to do it with git flow, so I fallback to doing it by hand

petervanderdoes avatar Feb 04 '15 03:02 petervanderdoes

Isn't this functionality already provided by the git flow release delete <name> command and the shortcut git flow delete command (when you're already on the release branch that you wish to abandon)?

jkankiewicz avatar May 21 '18 17:05 jkankiewicz

Hi,

Is this funcionality already provided? I can cancel RC’s?

wilbertjoosen avatar Jun 18 '19 08:06 wilbertjoosen

...all the fixes should be back-merged to develop.

@wilbertjoosen, You're right; a new command is needed because the delete command won't merge any commits that are unique to the branch into its parent branch before it is deleted. Either that or a --preserve-commits flag (or something like it) will have to be added to the delete command. The tricky thing is that you don't want it to preserve any commits that update the version number because those should only ever originate from a release branch. It seems to me that if this command (or flag) is added then the merging process would have to be interactive so that the user will have an opportunity to skip over any commits that update the version number prematurely.

jkankiewicz avatar Jun 21 '19 18:06 jkankiewicz