Conflicts, all in files this branch and master both touched: - `chat/helpers.ts` — kept both sides. Master replaced the inline env filter in `gitBranch` with `scrubbedParentEnv()`; this branch added the surface-marker and compaction-source imports. - `docs/module-graph.md` — regenerated. Both sides added a `tui` edge (master `subprocess`, this branch `compact`); the generated row now carries both. - Three `.i18n.yaml` pairing records — re-recorded from the merged files. Blob hashes cannot be hand-merged, and both sides' prose survives on each side of every pair. `docs/cordis-catalog/services.md` also regenerated for shifted source lines and master's new `sessionTitle.rename` entry.
7 lines
438 B
YAML
7 lines
438 B
YAML
# Bilingual-pair consistency record (docs/i18n/README.md): the git blob hash of each
|
|
# side as of the last confirmed-consistent state. Both languages carry equal authority;
|
|
# after editing either side, bring the other along and re-record with:
|
|
# pnpm run verify-translation-pairing --write docs/core-data-structures/session.md
|
|
session.md: 0c89f69ec0ccb893bb785e4f717cfd8ccb754514
|
|
session.zh.md: 7c966ee2c779954d863b53c45e29be28458e675f
|