Commit Graph

8 Commits

Author SHA1 Message Date
Tianyi Cui 1bc1b73d16 Merge branch 'worktree/ci-native-windows-20260808' into worktree/ci-native-windows-coverage-20260808 2026-08-09 16:47:17 +08:00
xjt 9087be1a2a fix(docs): address generated translation review findings 2026-08-09 12:21:57 +08:00
Tianyi Cui 94799abfb0 test(windows): stabilize native coverage 2026-08-09 02:29:09 +08:00
Tianyi Cui 58b89fb6b4 test(i18n): align merge failure fixtures 2026-08-09 00:50:13 +08:00
Tianyi Cui 9c13a62702 fix(i18n): preserve merge conflicts without runtime 2026-08-09 00:37:46 +08:00
Tianyi Cui 9a4b70cf3b fix(i18n): harden stopped-merge recovery 2026-08-08 21:49:23 +08:00
Tianyi Cui 75570ba31e test(i18n): deduplicate merge conflict setup 2026-08-08 21:26:31 +08:00
Tianyi Cui 542c029c80 feat(i18n): compose pairing records during merges 2026-08-08 21:11:59 +08:00