Handle multiple conflict revisions deterministically

This commit is contained in:
vorotamoroz committed 2026-07-23 06:38:16 +00:00
1 parent d784799969
commit f8f11f358a
15 files changed
+576 -97

No files matched your search

@@ -8,6 +8,8 @@
*/
export const liveSyncProvisionalEnglishMessages = {
"This file has unresolved conflicts.": "This file has unresolved conflicts.",
"This file has ${COUNT} unresolved versions. They will be reviewed one pair at a time.":
"This file has ${COUNT} unresolved versions. They will be reviewed one pair at a time.",
} as const;
export type LiveSyncProvisionalMessageKey = keyof typeof liveSyncProvisionalEnglishMessages;