You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Merge branch 'claude/issue-14478-duration-unit-in-key-name' into claude/issue-15682-widen-duration-unit-keys-population
Cards 2/6..5/6 of the #14478 stack landed on the trunk as squashes, which kept
their content and destroyed their ancestry, so this branch's merge base rewound
to 140e0b2 and seven files conflicted. Every one resolves by taking a side
whole; none is hand-merged.
Group A - five files this card never touched (head blob == fork point
3351a86), resolved to the TRUNK's side, which carries cards 3/6 and 4/6's
later prose corrections:
.changeset/kernel-duration-keys-unit-in-key-name.md
packages/spec/src/kernel/plugin-security-advanced.test.ts
packages/spec/src/migrations/entries/semantic/18.kernel-plugin-security-durations-unit-in-key.ts
packages/spec/src/migrations/entries/semantic/18.system-metrics-window-durations-unit-in-key.ts
packages/spec/src/migrations/registry.ts
Group B - two files that are this card's own work, resolved to THIS BRANCH's
side. The trunk contributes nothing to either: its blob is byte-identical to
this branch's fork point (check-duration-unit-keys.ts fe98c8f,
conversions/registry.ts 07e13ff), so the conflict is an artifact of the
rewound base alone:
packages/spec/scripts/check-duration-unit-keys.ts
packages/spec/src/conversions/registry.ts
No merge=os-regen path is modified on both sides (all seven read
`merge: unspecified`), so nothing is deferred and there is no regeneration
half. The migrations registry takes the trunk's side and loses no row: both
sides carry the same 180 retired-key ids, and the only textual difference is
prose inside two entries' rationale strings.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01G4138K1EG7kQ81FNba5Kp4
0 commit comments