Repository navigation
Commit 4d55c06
committed
fix(spec): restore step18's two hand-edited lines the merge resolution dropped
`migrations/registry.ts` is generated only BETWEEN its `os-generated`
markers; `step18.conversionIds` and `step18.rationale` are hand-authored
append regions outside them. Resolving the merge conflict by taking
main's side and regenerating therefore restored every entries-derived
row and silently dropped both of this branch's hand-edits, which no
generator reproduces.
The consequence was not cosmetic: without
`'page-assigned-profiles-removed'` in `step18.conversionIds` the 17 -> 18
hop stops applying the conversion at all, so a replayed page keeps
`assignedProfiles`. `migrations.test.ts`'s chain-replay composability
gate caught it — "expected { pages: [ {...3}, {...3} ] } to deeply equal
{ pages: [ {...2}, {...3} ] }", the key still present after the chain.
That gate is the reason a clean merge is not a working merge.
Both intents are kept, main's first: the conversion id list carries
`list-view-sort-string-clause-to-array` then
`page-assigned-profiles-removed`, and the rationale carries main's
list-view sort paragraph then this branch's `page.assignedProfiles` one.
Re-running `gen:migration-registry` afterwards is byte-identical, which
is the proof these lines sit outside the generated regions.
Claude-Session: https://claude.ai/code/session_01EfsizFDgAcEjpwv4oM3WGT
Co-authored-by: Claude <noreply@anthropic.com>1 parent 158ad6e commit 4d55c06
1 file changed
Lines changed: 14 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5470 | 5470 | | |
5471 | 5471 | | |
5472 | 5472 | | |
5473 | | - | |
| 5473 | + | |
| 5474 | + | |
| 5475 | + | |
| 5476 | + | |
| 5477 | + | |
| 5478 | + | |
| 5479 | + | |
| 5480 | + | |
| 5481 | + | |
| 5482 | + | |
| 5483 | + | |
| 5484 | + | |
| 5485 | + | |
5474 | 5486 | | |
5475 | 5487 | | |
5476 | 5488 | | |
| |||
5499 | 5511 | | |
5500 | 5512 | | |
5501 | 5513 | | |
| 5514 | + | |
5502 | 5515 | | |
5503 | 5516 | | |
5504 | 5517 | | |
| |||
0 commit comments