Batch 1's content is on main as de24e633, studio's re-application rather
than my cf8cc929, so the commit is not an ancestor and only the CONTENT
test says it landed: RegionSectionCard.vue on origin/main is byte-identical
to mine.
Three conflicts, none resolved by choosing a side:
gates:post — both sides added tokens. Mine brought
check:shadow-css-parses, main brought check:no-silent-engine and
check:i18n-stopped-scope. Taking either side would have dropped the
other's gates, so the tokens are unioned: 81, none lost.
check-regions-uses-library.mjs — add/add. Mine is the superset; the only
two lines unique to main's copy are ones batch 2 deliberately replaced,
generalising the import assertion to @map/components/<dir>/<name> so
ProgressBar in charts/ resolves.
reference-library-index.md — derived, so regenerated rather than merged
by hand. 113 items.
Verified after merging by content and by authorship, not by reading a diff:
all four batch-2 components, the CLDR vendor and the gate survive; the
plugin still renders them and still ships no .rd-card CSS; SJM -> SJ and
NOR -> NO hold. git log over the merge base shows only my own commit
touched region-dashboards.vue, so nothing of another agent's was at risk
there. 12 gates green.
d378b38653