Conversation
When GitHub merges a PR but fails only on local branch deletion (active worktree), the finish script previously treated that as a merge failure and skipped cleanup. This patch detects that specific gh error signature, treats merge as successful, and continues local/remote branch cleanup. Constraint: Preserve existing PR fallback behavior for true policy/check blockers Rejected: Retrying gh merge without --delete-branch | still leaves local/remote cleanup fragmented across manual steps Confidence: high Scope-risk: narrow Reversibility: clean Directive: If gh merge output format changes, keep this matcher aligned with real CLI error text before loosening detection Tested: npm test (44/44), including new regression for local-branch-delete error path in PR mode Not-tested: Live GitHub PR merge with this exact local-delete failure on every gh version
NagyVikt
deleted the
agent/codex/20260411-135657-pia-edix-hu-dup-2-branch-finish-pr-delete-error
branch
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.
Automated by scripts/agent-branch-finish.sh (PR flow).