Skip to content
This repository has been archived by the owner on Jun 19, 2023. It is now read-only.

git flow hotfix finish -b still back-merges to develop #390

Open
adamrodger opened this issue Nov 2, 2018 · 0 comments · May be fixed by #395
Open

git flow hotfix finish -b still back-merges to develop #390

adamrodger opened this issue Nov 2, 2018 · 0 comments · May be fixed by #395

Comments

@adamrodger
Copy link

if ! git_is_branch_merged_into "$MERGE_BRANCH" "$DEVELOP_BRANCH"; then

When git flow hotfix finish is passed the -b flag then it's not supposed to merge master to develop, but it does.

Steps:

git flow init -d
git flow hotfix start 1.0.1
git commit --allow-empty -m "hotfix commit"
git flow hotfix finish -b 1.0.1

The only difference between with and without -b is the way in which the merge is made to develop. What I want is for no merge to develop at all.

@adamrodger adamrodger changed the title git flow hotfix finish -b still back-merges master to develop git flow hotfix finish -b still back-merges to develop Nov 2, 2018
adamrodger added a commit to adamrodger/gitflow-avh that referenced this issue Nov 6, 2018
…etervanderdoes#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.
ChrisJStone referenced this issue in CJ-Systems/gitflow-cjs Jul 5, 2023
… #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.
ChrisJStone referenced this issue in CJ-Systems/gitflow-cjs Jul 5, 2023
… #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.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging a pull request may close this issue.

1 participant