Address PRs by number instead of head branch name#45
Merged
Conversation
The squash-merge fan-out retargeted every updated child PR onto the target branch and only afterwards pushed the new heads, batched into a single non-atomic push together with the merged-branch deletion. If the push failed (e.g. someone pushed to a child mid-run, rejecting the plain push) or a pr edit died partway through the loop, set -e aborted the run with PRs already retargeted but their heads stale - and unlike the conflict-resume path there is no label to re-trigger the action, so nothing ever repaired them. Apply the ordering the resume path already uses: push the updated heads first, then flip the bases, and delete the merged branch last (deleting a PR's base branch closes the PR, so every child must be off it first). A failed push now leaves the PRs untouched on their old base. The unit test captures the run transcript and asserts the push -> retarget -> delete order; it fails against the previous code. Also corrects the README: pushes are plain, not forced, and branch deletion is its own final step. 🤖 Generated with [Claude Code](https://claude.com/claude-code) https://claude.ai/code/session_01JHvKryT4QUpHYdNq9YEQxX
…g-check-3njvdx # Conflicts: # README.md
Since #40 the conflict comment's fast-forward step reads `git merge --ff-only origin/<branch>`, which assert_conflict_comment_merges picks up with its `^git merge` grep, so the extracted commands never match the expected conflict merges. Skip the --ff-only line when extracting. Also trim the new comments in the fan-out push/retarget/delete sequence. 🤖 Generated with [Claude Code](https://claude.com/claude-code) https://claude.ai/code/session_01JHvKryT4QUpHYdNq9YEQxX
The fix for the --ff-only line breaking assert_conflict_comment_merges moved to a separate PR; the e2e job here stays red until that lands and main is merged back in. 🤖 Generated with [Claude Code](https://claude.com/claude-code) https://claude.ai/code/session_01JHvKryT4QUpHYdNq9YEQxX
A head branch can carry several PRs (one per base), so gh calls keyed by branch name can comment, label, or retarget the wrong one. Every gh call that acts on a specific PR now uses the PR number: the fan-out carries number/branch pairs from gh pr list, and the conflict-resolved run gets PR_NUMBER from the event payload via action.yml. The payload also already carries the PR's base branch, so the resume takes it from a new PR_BASE variable instead of querying the API; the resume test's gh mock no longer answers baseRefName queries, so a reintroduced lookup fails loudly. 🤖 Generated with [Claude Code](https://claude.com/claude-code) https://claude.ai/code/session_01JHvKryT4QUpHYdNq9YEQxX
Phlogistique
added a commit
that referenced
this pull request
Jun 9, 2026
`branches: ['*']` looks like "all branches", but in GitHub's [filter pattern syntax](https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet) the `*` glob does not match `/` — and `pull_request.branches` filters on the *base* branch. So the Tests workflow silently skipped any PR whose base branch contains a slash. Concretely: #45 is stacked on #42's `claude/...` branch and got no Tests run at all. Drop the filter — a bare `pull_request:` trigger covers every base branch. (`'**'` would too, but no filter says what it means.) The README's example workflows never had a filter, so no doc change is needed beyond the inline comment. 🤖 Generated with [Claude Code](https://claude.com/claude-code) https://claude.ai/code/session_01JHvKryT4QUpHYdNq9YEQxX --- _Generated by [Claude Code](https://claude.ai/code/session_01JHvKryT4QUpHYdNq9YEQxX)_ Co-authored-by: Claude <noreply@anthropic.com>
…ber-addressing-3njvdx
This was referenced Jun 9, 2026
github-actions
Bot
changed the base branch from
claude/code-review-bug-check-3njvdx
to
main
Phlogistique
added a commit
that referenced
this pull request
Jun 11, 2026
The squash sequence assumes `SQUASH_COMMIT~` is the target just before
the merge, which only holds for squashes. GitHub records the merge
method nowhere (payload, REST, GraphQL), so the action infers it and now
handles each shape:
* Merge commit: detected by the second parent. The merge carries the
parent's commits into the target, so the children's heads are already
valid; the action only retargets the children and deletes the merged
branch, the same end state GitHub produces natively when the branch is
deleted. Going through the squash sequence also produced a correct
result (verified by simulation), but pushed a redundant synthetic merge
to every child, with a CI run each.
* Rebase: detected through GitHub's commit-PR association
(`/commits/{sha}/pulls`, "the merged pull request that introduced the
commit"). A squash introduces a single commit, so the commit below the
merge sha belongs to an older PR or to none; a rebase introduces a copy
of each PR commit, so the commit below still belongs to this PR
(verified against real merges on a scratch repo). The association is
computed asynchronously, ~15-30s after the merge in testing, so an empty
answer is only trusted once the merge sha itself is associated; on API
failure or timeout the run aborts rather than guessing. Not supported:
the copies are new commits, so a child retargeted as-is would show the
parent's changes in its diff, and the squash sequence can raise spurious
conflicts against the intermediate copies (observed in simulation). The
action comments on each child PR that the stack must be updated manually
and leaves everything alone, including the merged branch.
* Single-commit PRs merge identically under rebase and squash and
correctly read as squashes.
A PR whose commits are all merge commits would defeat the rebase
detection, but GitHub refuses to rebase-merge those (`rebaseable:
false`, verified on a scratch repo).
Stacked on #45.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
https://claude.ai/code/session_01JHvKryT4QUpHYdNq9YEQxX
---------
Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: github-actions <github-actions@github.com>
Phlogistique
added a commit
that referenced
this pull request
Jun 11, 2026
`pr_has_conflict_label` swallowed gh failures as "no label", so a transient API error made the resume silently skip a labeled PR. Worse, a failed comments fetch in `read_state_marker` read as "no marker", which made the caller *abandon* the resume and drop the conflict label for good — a dead end. Both now abort the run instead; the label stays on, so the next push retries. Stacked on #45; #51 builds on this. 🤖 Generated with [Claude Code](https://claude.com/claude-code) https://claude.ai/code/session_01JHvKryT4QUpHYdNq9YEQxX --- _Generated by [Claude Code](https://claude.ai/code/session_01JHvKryT4QUpHYdNq9YEQxX)_ --------- Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: github-actions <github-actions@github.com>
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
2 participants
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.
A head branch can carry several PRs (one per base), so
ghcalls keyed by branch name can comment on, label, or retarget the wrong PR — the same ambiguous-lookup family as the bug fixed in #39. Everyghcall that acts on a specific PR now uses the PR number:gh pr list(numbers forgh, branches forgit).PR_NUMBERfrom the event payload viaaction.yml.This is also an opportunity to drop an API call: the synchronize payload already carries the PR's base branch, so the resume's manual-retarget check now reads it from a new
PR_BASEenv var instead ofgh pr view --json baseRefName. The resume test's gh mock no longer answersbaseRefNamequeries, so a reintroduced lookup fails loudly.Stacked on #42 (the changes overlap in
main()); this PR retargets ontomainonce #42 lands.🤖 Generated with Claude Code
https://claude.ai/code/session_01JHvKryT4QUpHYdNq9YEQxX
Generated by Claude Code