feat(hotfix): add backmerge option to release branch #71
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… #390 The previous solution still caused a merge to develop, it just performed the merge slightly differently which was misleading. The new solution does not merge to develop at all as the flag description implies.
Add new option releaseBackMerge to git flow hotfix finish when there is an existing release on a remote repository we can now backmerge the hotfix onto the release branch as well as develop and master. Origional author of PR: Bankers, R.H.M. (Rob) <rob.bankers@sns.nl> closes nvie/gitflow#177 and closes petervanderdoes/gitflow-avh#161
Merged
ChrisJStone
added a commit
that referenced
this pull request
Jul 6, 2023
* feat(git-flow): add support for busybox(#12) * feat(init): add support for environment credentials (#19) Allows git flow to fall back to the same environment variables git uses for setting the author and committer details if they are not present in the users .gitconfig * feat(init): add option to sign initial commit (#59) When running git flow init the following option is now available when creating a git repository using git flow.. 1) -g, --[no]sign Sign initial commit when creating a repository When setting up git flow in a freshly created git repository with no prior commits or when using git flow to create a git repository in an existing folder the sign flag will create a signed empty commit with the message initial commit. * feat(feature): add feature release command (#64) Added git flow feature release to provide a quick way to create a release branch from a existing feature branch. * fix(hotfix): git flow hotfix track fails due to branch name check (#68) * feat(hotfix): add cherrypick option to hotfix finish (#73) * feat(hotfix): add backmerge option to release branch (#71) * fix(hotfix): git flow hotfix finish -b back-merges to develop (#66) When runing hotfix finish the following options have been the following options have been added: 1) -r, --releaseBackmerge Back-merge to release branch if exists 2) -c, --cherrypick Cherry Pick to develop instead of merge 3) -b, --[no]nobackmerge Don't merge master, or tag onto develop NOTE: One one of the above three options can be used at any given time since it doesn't make sence to combine them. * fix(log): fix git flow log help message (#15) git flow log help no longer implies it can only be used with feature branches
ChrisJStone
added a commit
that referenced
this pull request
Jul 6, 2023
* feat(git-flow): add support for busybox(#12) * feat(init): add support for environment credentials (#19) Allows git flow to fall back to the same environment variables git uses for setting the author and committer details if they are not present in the users .gitconfig * feat(init): add option to sign initial commit (#59) When running git flow init the following option is now available when creating a git repository using git flow.. 1) -g, --[no]sign Sign initial commit when creating a repository When setting up git flow in a freshly created git repository with no prior commits or when using git flow to create a git repository in an existing folder the sign flag will create a signed empty commit with the message initial commit. * feat(feature): add feature release command (#64) Added git flow feature release to provide a quick way to create a release branch from a existing feature branch. * fix(hotfix): git flow hotfix track fails due to branch name check (#68) * feat(hotfix): add cherrypick option to hotfix finish (#73) * feat(hotfix): add backmerge option to release branch (#71) * fix(hotfix): git flow hotfix finish -b back-merges to develop (#66) When runing hotfix finish the following options have been the following options have been added: 1) -r, --releaseBackmerge Back-merge to release branch if exists 2) -c, --cherrypick Cherry Pick to develop instead of merge 3) -b, --[no]nobackmerge Don't merge master, or tag onto develop NOTE: One one of the above three options can be used at any given time since it doesn't make sence to combine them. * fix(log): fix git flow log help message (#15) git flow log help no longer implies it can only be used with feature branches * chore(release): release version 2.2.0 --------- Signed-off-by: Shea690901 <ginny690901@hotmail.de> Co-authored-by: Filipe Kiss <hello@filipekiss.com.br> Co-authored-by: Shea690901 <ginny690901@hotmail.de> Co-authored-by: Dmitry Bogatov <git#v1@kaction.cc> Co-authored-by: ab <adamdd55@gmail.com> Co-authored-by: Adam Rodger <adam.rodger@gmail.com> Co-authored-by: Bankers, R.H.M. (Rob) <rob.bankers@sns.nl> Co-authored-by: blooper05 <legend.of.blooper@gmail.com> Co-authored-by: simonweil <swdevelop1981@gmail.com>
ChrisJStone
added a commit
that referenced
this pull request
Jul 6, 2023
* docs(changelog): add release notes * feat(git-flow): add support for busybox(#12) * feat(init): add support for environment credentials (#19) Allows git flow to fall back to the same environment variables git uses for setting the author and committer details if they are not present in the users .gitconfig * feat(init): add option to sign initial commit (#59) When running git flow init the following option is now available when creating a git repository using git flow.. 1) -g, --[no]sign Sign initial commit when creating a repository When setting up git flow in a freshly created git repository with no prior commits or when using git flow to create a git repository in an existing folder the sign flag will create a signed empty commit with the message initial commit. * feat(feature): add feature release command (#64) Added git flow feature release to provide a quick way to create a release branch from a existing feature branch. * fix(hotfix): git flow hotfix track fails due to branch name check (#68) * feat(hotfix): add cherrypick option to hotfix finish (#73) * feat(hotfix): add backmerge option to release branch (#71) * fix(hotfix): git flow hotfix finish -b back-merges to develop (#66) When runing hotfix finish the following options have been the following options have been added: 1) -r, --releaseBackmerge Back-merge to release branch if exists 2) -c, --cherrypick Cherry Pick to develop instead of merge 3) -b, --[no]nobackmerge Don't merge master, or tag onto develop NOTE: One one of the above three options can be used at any given time since it doesn't make sence to combine them. * fix(log): fix git flow log help message (#15) git flow log help no longer implies it can only be used with feature branches * chore(release): release version 2.2.0
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add new option releaseBackMerge to git flow hotfix finish when there is an existing release on a remote repository we can now backmerge the hotfix onto the release branch as well as develop and master.
closes #18
closes #69
closes nvie/gitflow#177
closes petervanderdoes/gitflow-avh#161