merge(master): checkpoint post-review base movement
Master advanced from e03b51d7db to ee223e6545 after bot-thread resolution and the PR-body policy fix. Merge-forward preserves the reviewed issue commits and explicit checkpoint history instead of rewriting the branch. The only textual conflict was the generated translation-pairing record for docs/config-catalog. Regenerate the English catalog from the combined source tree and re-record the bilingual hashes so current-master command-line changes and this PR's compression configuration coexist. Verified with pnpm run verify-config-catalog, pnpm run verify-translation-pairing docs/config-catalog.md, and git diff --cached --check.
This commit is contained in:
@@ -2,5 +2,5 @@
|
||||
# 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/config-catalog.md
|
||||
config-catalog.md: de8c8ed7244821c1ecf54686b1581cd4c59b838b
|
||||
config-catalog.zh.md: 0e3d99813d08ab886af6b8265eb0f62834555299
|
||||
config-catalog.md: 3da8082cea16684fa43481765d3429e4b1bb232d
|
||||
config-catalog.zh.md: 68494d9684de5c639bd8775460e04b74ca8c3b18
|
||||
|
||||
Reference in New Issue
Block a user