fix(api): stash uncommitted changes before merge-pr delete-branch#389
Open
fix(api): stash uncommitted changes before merge-pr delete-branch#389
Conversation
Prevents --delete-branch from failing when the worktree has uncommitted changes. Changes are stashed before gh pr merge and restored (popped) in a finally block so they survive even if the merge itself fails. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Contributor
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
gh pr merge --delete-branchto prevent branch deletion from failing when the worktree is dirtyfinallyblock to restore (pop) stashed changes even if the merge itself failsTest plan
🤖 Generated with Claude Code