Skip to content

chore(sync): reconcile the cf5f15e3 and f6d188bd entries with #432 - #433

Merged
IgorShevchik merged 1 commit into
mainfrom
sync/reconcile-f6d188b
Aug 18, 2026
Merged

chore(sync): reconcile the cf5f15e3 and f6d188bd entries with #432#433
IgorShevchik merged 1 commit into
mainfrom
sync/reconcile-f6d188b

Conversation

@IgorShevchik

Copy link
Copy Markdown
Collaborator

Bookkeeping only, per PORTING.md §6 step 4: the last entries of a run cannot name their own merge, so they land as pending-merge and a follow-up fills them in.

Both were merged together in #432, squash 807d52ef.

-    "pr": "pending-merge",
-    "b24ui_sha": "pending-merge",
+    "pr": 432,
+    "b24ui_sha": "807d52efaf8a29cc23b97df3a047c082752bfad0",

×2 — cf5f15e3 and f6d188bd.

State after this

  • No pending-merge anywhere in the ledger.
  • 255 entries.
  • cursor = f6d188bd785d40f2a2d721e3400091cc19cee236 = nuxt/ui@v4 HEAD — queue empty.
  • .sync/dep-parity.json already sits at this cursor; docs(showcase): widen the screenshotOptions schema #432 refreshed it, so nothing to do here.

Verify

Four JSON fields; nothing executable changes. Checked with lint and the test/utils suite (495 tests, 25 files) plus a parse check, rather than the full gauntlet.

Two specs read .sync/: icon-map.spec.ts, which reads icon-map.json and is unaffected, and the new dep-parity.spec.ts, which compares this file's cursor against the snapshot's — both are in that suite, so the light gate covers the parts that can actually break.


Generated by Claude Code

Bookkeeping only, per PORTING.md §6 step 4: the last entries of a run
cannot name their own merge, so they land as `pending-merge` and a
follow-up fills them in.

Both were merged together in #432, squash `807d52ef`.

No `pending-merge` remains. 255 entries, and `cursor` is `f6d188bd` —
equal to `nuxt/ui@v4` HEAD, so the queue is empty.

Four JSON fields. The parity snapshot needs no refresh: it is already at
this cursor, set by #432 itself.

Verified with lint and the `test/utils` suite rather than the full
gauntlet — nothing executable changes, and the only specs that read
`.sync/` are `icon-map.spec.ts`, which reads `icon-map.json`, and
`dep-parity.spec.ts`, which compares this file's `cursor` against the
snapshot's and is in that suite.
@IgorShevchik
IgorShevchik merged commit 28677ed into main Aug 18, 2026
1 check passed
@IgorShevchik
IgorShevchik deleted the sync/reconcile-f6d188b branch August 18, 2026 06:53
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