Skip to content

docs: plan to merge 71 open PRs into main - #72

Draft
infektyd wants to merge 2 commits into
mainfrom
agent/merge-prs-into-main-plan-1a9d
Draft

docs: plan to merge 71 open PRs into main#72
infektyd wants to merge 2 commits into
mainfrom
agent/merge-prs-into-main-plan-1a9d

Conversation

@infektyd

@infektyd infektyd commented Aug 17, 2026

Copy link
Copy Markdown
Owner

Summary

There are 71 open PRs. 70 of them are one linear stack (#1 + #3#70) whose tip already contains #2. #71 is an independent AGENTS.md docs change.

This PR adds the merge plan only. It does not land the stack.

Recommendation: fast-forward main to pr/genet31-v135 (0c26173), then merge #71. Do not squash. Do not merge #2 onto main separately.

git merge-tree --write-tree with no refs only prints usage. The preflight is:

git fetch origin main pr/genet31-v135 agent/cloud-dev-env-01f1
git merge-tree --write-tree origin/pr/genet31-v135 origin/agent/cloud-dev-env-01f1

Expected: a 40-char tree SHA, exit 0. Snapshot: 64d50fe5d8f265aea3b09f4aaece1ec7dfb01e5b.

A local feat/weaken-v45-selftest is not on origin. Dry-merge that checkout against #71 with git merge-tree --write-tree HEAD origin/agent/cloud-dev-env-01f1. The FF target is still pr/genet31-v135.

Full catalog: docs/superpowers/plans/2026-08-17-merge-stacked-prs-into-main.md

Test plan

  • git merge-base --is-ancestor origin/main origin/pr/genet31-v135
  • git merge-tree --write-tree origin/pr/genet31-v135 origin/agent/cloud-dev-env-01f164d50fe5d8f265aea3b09f4aaece1ec7dfb01e5b
  • Human re-runs Task 1 immediately before landing (SHAs may move)
  • This PR is docs-only; no metal claim
Open in Web Open in Cursor 

Catalog all 71 open PRs, recommend FF of pr/genet31-v135 (already contains
PR2), then land the independent Cloud AGENTS.md PR. Human merges; no squash.

Co-authored-by: Infektyd <infektyd@users.noreply.github.com>
Bare `git merge-tree --write-tree` only prints usage. The preflight
needs both stack-tip and PR71 refs; add a HEAD variant for a local
feat/weaken-v45-selftest checkout that is not on origin.

Co-authored-by: Infektyd <infektyd@users.noreply.github.com>
@infektyd

Copy link
Copy Markdown
Owner Author

Hi @infektyd - this PR hasn't had any activity in over 7 days. Please update it or close it if it's no longer needed. (No merge conflicts detected.)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants