Conversation
…ge + cleanup
Previous contract already listed the four flags in prose but allowed the
reader to stop at bare `--via-pr`. This session demonstrated the failure
mode: a PR merged before a follow-up commit pushed, stranding the commit
on a local agent branch.
Changes:
- Switch the step-3 example's `--base dev` to `--base main` (this repo's
default base) so the recipe runs verbatim.
- Add a "Default Claude finish (non-negotiable)" subsection that:
- Requires all four flags unless the user opts out.
- Shows the `gh pr merge <N> --auto --squash` follow-on for
branch-protected repos.
- Documents `GUARDEX_FINISH_MERGE_TIMEOUT` for slow CI.
- Points to `gx finish --all` for sweeping multiple lanes.
- Captures the `git worktree remove --force` recovery recipe when a
source-probe temp worktree holds an agent branch.
NagyVikt
deleted the
agent/claude/default-claude-finish-auto-merge-cleanup-2026-04-23-21-49
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 gx branch finish (PR flow).