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

cannot kill freshly created parent branch #3097

Closed
kevgo opened this issue Feb 11, 2024 · 0 comments · Fixed by #3160
Closed

cannot kill freshly created parent branch #3097

kevgo opened this issue Feb 11, 2024 · 0 comments · Fixed by #3160
Labels
Milestone

Comments

@kevgo
Copy link
Contributor

kevgo commented Feb 11, 2024

steps to reproduce

  • have a branch branch2 with some commits
  • run git prepend branch1
  • run git kill

expected result

it kills branch1 and branch2 is the new branch

actual result

[branch2] git branch -d branch1
error: the branch 'branch1' is not fully merged.
If you are sure you want to delete it, run 'git branch -D branch1'


Error: exit status 1

To continue after having resolved conflicts, run "git-town continue".
To go back to where you started, run "git-town undo".

analysis

It might be better to always use -D when deleting branches:

  • nobody notices or cares when we use -d
  • there is no benefit to Git Town
  • determining whether to use -d or -D requires complexity that doesn't add value
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging a pull request may close this issue.

1 participant