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

Prevent hotfixes being merged to develop with nobackmerge flag, fixes… #21

Closed

Conversation

ChrisJStone
Copy link
Member

This is a re submission of PR 395 in reference to issue 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.

…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 ChrisJStone self-assigned this Jul 5, 2023
@ChrisJStone ChrisJStone added this to the 2.2.0 milestone Jul 5, 2023
@ChrisJStone ChrisJStone linked an issue Jul 5, 2023 that may be closed by this pull request
ChrisJStone added a commit that referenced this pull request Jul 5, 2023
)

fix(hotfix): fix nobackmerge flag

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.

closes #21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

fix: git flow hotfix finish -b still back-merges to develop
2 participants