Skip to content

fix: mark stacked PRs so repair can find them #38

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.

Sign up for GitHub

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

Merged
lemarier merged 1 commit into from
Sep 27, 2026
Merged

fix: mark stacked PRs so repair can find them #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions skills/origin89-orca/references/unattended-run.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,8 +283,9 @@ it and cannot collide, and the PR shows only its own diff. Stack only on a PR
whose worker has settled and that lacks `needs-human-review` and `human-only`;
otherwise pick another issue. The spec names the lower branch and head SHA and
has the worker create the layer with `gh stack add <branch>` from a checkout of
that branch, open the PR with `gh stack submit --auto --open`, and never edit
the lower layer. A finding that belongs in the lower layer goes back to the
that branch, open the PR with `gh stack submit --auto --open`, put the line
`Stacked on #<lower PR>` in its body so a later pass can find the stack, and
never edit the lower layer. A finding that belongs in the lower layer goes back to the
coordinator.

Stacks keep one writer per layer. Only the coordinator, through a repair
Expand Down Expand Up @@ -325,8 +326,11 @@ unneeded update restarts reviews. A resolution that would choose between
behaviours is a blocker: the worker comments it on the PR and the coordinator
hands the PR over.

A stacked PR also needs repair when its lower layer has merged, so the gate can
reach it, or when `gh stack view --json` reports `needsRebase`. Its repair
A stacked PR also needs repair when the PR its `Stacked on` line names has
merged and that merge commit is not in its head, or when `gh stack view --json`
reports `needsRebase`. With squash merges and branch deletion, GitHub retargets
the layer to the default branch but it still carries the lower layer's
original commits, so it may not show as conflicting. Its repair
worker restacks with `gh stack sync` instead of merging the base: `sync`
handles squash-merged layers and retargets each PR to its new base. This is
the only repair that force-pushes, and only the stack's own layers. On a
Expand Down
Loading