Skip to content

release: 17.0.0-rc.4 published from a10cbc77 but the version commit never landed on main — 2026-08-03 shape repeated; merge it back before ANY further release action #6169

Description

@hotlong

Facts (all measured 2026-08-07 ~05:30Z)

Why this must be fixed before anything else in the release lane

main's package.json still say 17.0.0-rc.3, so every regeneration of changeset-release/main computes rc.4 again — a version npm now already has. The branch has in fact regenerated after the publish (head a1e65f22a10cbc77), so ⚠️ merging #4935 as it stands is the collision trap, not the fix. Do not merge #4935 and do not run the publish lane again until this issue closes.

Remedy (measured, clean)

git merge-tree --write-tree origin/main a10cbc77exit 0, no conflicts. So:

  1. Push the published commit as a branch: git push origin a10cbc77a1e83a382d4a190879b39d588435a04d:refs/heads/release/rc4-merge-back
  2. Open a PR (base main), label skip-changeset (release bookkeeping; .changeset/** must not be touched beyond what the commit itself carries), land it through the merge queue.
  3. After it lands, changeset-release/main regenerates from rc.4 state → chore: version packages (rc) #4935 becomes the rc.5 PR, and the dry-run check is simply "does chore: version packages (rc) #4935 now propose rc.5?".

Ordering vs #6159 (console bump): independent — its changeset is a new file, no conflict either way; it now targets rc.5 (see note there).

Related

#6135 / #6149 (rc.3 instance + field-level reconciliation) · root-cause issue: see the companion issue filed together with this one · #6159 (missed window) · #3340 (the gate the bypass skipped) · #4935

Activity

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

Metadata

Metadata

Assignees

Type

No type

Projects

No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions