Skip to content

Document a conflict-free order for merging every open PR - #23

Closed
sykosyber wants to merge 1 commit into
mainfrom
cursor/merge-plan-open-prs-9ece
Closed

sykosyber wants to merge 1 commit into
mainfrom
cursor/merge-plan-open-prs-9ece

Conversation

@sykosyber

Copy link
Copy Markdown
Member

Problem and result

Relay has seven open pull requests and thirteen open issues stacked on the same main, several of which already contain the delivery foundation. Squash-merging them in GitHub number order would reintroduce bootstrap CI, conflict in package.json / vite.config.ts / README public-copy markers, and land an unsafe React 19.2.6 + RSC 19.2.8 Dependabot bump.

This adds the reviewed merge strategy and the step-by-step train:

  • Spec: docs/superpowers/specs/2026-09-06-merge-all-open-prs-design.md
  • Plan: docs/superpowers/plans/2026-09-06-merge-all-open-prs.md

Order: close #10 → squash #14 → rebase #18 → unique-tree replay #13 → unique-tree replay #11 (README + integrations/README recipes) → rebase #12 with the Windows Node guard → rebase #15 without rewriting the unit-test script.

No application source, schema, or workflows change in this PR.

Evidence

Review

  • One issue owns this scope; unrelated changes are separate. (Planning only; does not close product tickets.)
  • Tests exercise the changed behavior, including failure paths. (N/A — no runtime change.)
  • No credentials, personal applications, or private research are included.
  • Agent findings are fixed or answered with evidence.
  • A maintainer other than the author will approve.

This PR is not part of the application merge train. After it is reviewed, execute the plan on the existing product PRs. Agents cannot squash-merge; last-push human approval is still required.

Open in Web Open in Cursor 

Inventory the seven open pull requests and thirteen open issues, record
the simulated stack conflicts, and specify unique-tree replay after the
delivery-foundation squash so later PRs do not reintroduce bootstrap CI
or unsafe React peer ranges.

Co-authored-by: sykosyber <sykosyber@users.noreply.github.com>
@sykosyber
sykosyber marked this pull request as ready for review September 6, 2026 00:14
@sdcarlson

Copy link
Copy Markdown
Contributor

Closing this documentation-only PR as an execution aid that does not need to enter the application base. The branch and its merge simulations remain available for reference. #10 is already closed, #14 is now merged, and this session is executing cleanup. The recorded order is also stale: #11 now includes corrected #15 session handling and a reproduced/fixed tracker-401 privacy gap (3980d96); do not replay the older 0a56f3f CSV tree over that fix. PR #12 has a Windows-and-delivery integration prepared on codex/pr12-windows-delivery-ready (b19fedb), with local unit/API/browser checks passing. Current status and required approvals belong on the affected PRs rather than another 723-line planning merge.

@sdcarlson sdcarlson closed this Sep 6, 2026
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.

3 participants