Stage Branch Checklist
Use these commands to inventory and replay stage onto the primary branch:
git fetch origin --prune
git log --first-parent --decorate --oneline origin/main..origin/stage
git log --left-right --cherry-pick --oneline origin/main...origin/stage
git diff --stat origin/main..origin/stage
gh pr list --state all --limit 100 --json number,title,baseRefName,headRefName,state,mergedAt,urlCreate one worktree per replay branch:
git worktree add -b codex/<topic> worktrees/<topic> origin/main
git cherry-pick <commit>...
git push -u origin codex/<topic>
gh pr create --base main --head codex/<topic>Use replacement PRs instead of stale originals when:
- the original PR is old and no longer merges cleanly
- the original CI is stale or broken for reasons already fixed on the primary branch
- conflict resolution is easier to express from a fresh primary-branch base
Suggested closure language for superseded PRs:
Superseded by #<replacement>, which ports this change set onto the current primary branch and has already been merged. Closing this PR to keep the merge history clean.Suggested closure language for the stage umbrella PR:
Superseded by the split merge set already merged into the primary branch. Closing this umbrella PR because the intended stage state was merged through the replacement PR set instead.