Skip to content

chore(sync): reconcile the 545f9e37 and be58f3f5 entries with #445 - #446

Merged
IgorShevchik merged 1 commit into
mainfrom
sync/reconcile-be58f3f
Aug 20, 2026
Merged

chore(sync): reconcile the 545f9e37 and be58f3f5 entries with #445#446
IgorShevchik merged 1 commit into
mainfrom
sync/reconcile-be58f3f

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 merged in #445, squash fc562bce.

-    "pr": "pending-merge",
-    "b24ui_sha": "pending-merge",
+    "pr": 445,
+    "b24ui_sha": "fc562bcefd685fd8f5fe0ace4d99293a46359c16",

×2 — 545f9e37 and be58f3f5.

State after this

Verify

Four JSON fields. Checked with lint and the test/utils suite (495 tests, 25 files) — where both specs that read .sync/ live: icon-map.spec.ts, and dep-parity.spec.ts, which compares this file's cursor against the snapshot's.


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 merged in #445, squash `fc562bce`.

No `pending-merge` remains. 263 entries, and `cursor` is `be58f3f5`.

`.sync/dep-parity.json` already sits at this cursor; #445 refreshed it.

Four JSON fields. Verified with lint and the `test/utils` suite, where both
specs that read `.sync/` live — `icon-map.spec.ts` and `dep-parity.spec.ts`,
the latter comparing this file's `cursor` against the snapshot's.
@IgorShevchik
IgorShevchik merged commit fa9cca4 into main Aug 20, 2026
1 check passed
@IgorShevchik
IgorShevchik deleted the sync/reconcile-be58f3f branch August 20, 2026 04:03
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