Conflict resolution: - docs/config-catalog: regenerate the English page; the Chinese page follows the three shifted Config sources and the bilingual pair record is re-recorded. - docs/module-graph: the generator rewrites all three artifacts together. - packages/shell/tool-pwsh-persistent/src/index.ts: keep master's rewrite of the prompt handling and re-apply the surrogate cap and its import. - The three package.json dependency entries follow master's workspace:* range convention, and the lockfile importer specifiers match them.
7 lines
432 B
YAML
7 lines
432 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/module-graph.md
|
|
module-graph.md: 60cdb26c3688acf6ff4e90f5722f9ffeb529786a
|
|
module-graph.zh.md: ba66cfa9900620470dd45200f9514b02fac72cb8
|