Skip to content

docs: Harden stacked-PR recovery to resolve merge SHA from the PR #60

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
thecodedrift merged 2 commits into from
Jul 11, 2026
Merged

docs: Harden stacked-PR recovery to resolve merge SHA from the PR #60

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f07cff5
docs: Harden stacked-PR recovery to resolve merge SHA from the PR
thecodedrift Jul 11, 2026
89c15d5
docs: Disambiguate parent vs child PR in stack recovery step
thecodedrift Jul 11, 2026
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
13 changes: 9 additions & 4 deletions CLAUDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,16 @@ Stacked branches share commits (each child contains its ancestors). Prefer expli

### Recovery if a child PR gets closed by base-branch deletion

1. Restore the deleted base branch ref at the merge commit's second parent:
`gh api --method POST repos/<owner>/<repo>/git/refs -f ref=refs/heads/<branch> -f sha=$(git rev-parse origin/main^2)`
This happens when the **parent** PR is merged with `--delete-branch`: deleting the parent's head branch (which is the child's base) closes the **child** PR. Two PRs are involved — the merged parent (`<parent>`) and the closed child (`<child>`); `<branch>` is the deleted base, i.e. the parent's head branch.

1. Restore the deleted base branch ref at the **parent** merge commit's second parent (the deleted branch's pre-merge tip). Resolve the merge commit from `<parent>` — the PR that actually merged — **not** the closed child (it's unmerged, so its `mergeCommit` is `null` and `git rev-parse` would fail), and **not** `origin/main^2` (only that second parent while the parent merge is still `main`'s tip; any later merge, or a squash/rebase tip, makes it the wrong SHA):
```bash
MERGE_SHA=$(gh pr view <parent> --repo <owner>/<repo> --json mergeCommit --jq .mergeCommit.oid)
gh api --method POST repos/<owner>/<repo>/git/refs -f ref=refs/heads/<branch> -f sha=$(git rev-parse "$MERGE_SHA^2")
```
2. Reopen the child via **REST** (GraphQL `gh pr reopen` fails on the Projects-classic deprecation):
`gh api --method PATCH repos/<owner>/<repo>/pulls/<n> -f state=open`
3. Retarget it: `gh pr edit <n> --base main` (only works once it's open).
`gh api --method PATCH repos/<owner>/<repo>/pulls/<child> -f state=open`
3. Retarget it: `gh pr edit <child> --base main` (only works once it's open).

### Other gotchas

Expand Down
Loading