diff --git a/src/func/dailynote/handle-duplicate.ts b/src/func/dailynote/handle-duplicate.ts index 789eb9c..13d48ae 100644 --- a/src/func/dailynote/handle-duplicate.ts +++ b/src/func/dailynote/handle-duplicate.ts @@ -41,7 +41,7 @@ async function mergeDocs(docs: DocBlock[], callback?: () => void) { return latestDoc; } -function buildShowDuplicateDocDom(docs: Block[], notebook: Notebook): string { +function buildShowDuplicateDocDom(docs: Block[], notebook: Notebook, ansestorDup?: boolean): string { let confilctTable = []; for (let doc of docs) { @@ -65,6 +65,7 @@ function buildShowDuplicateDocDom(docs: Block[], notebook: Notebook): string { style="margin: 0.5rem;" > ${content} + ${ansestorDup ? i18n.ConflictDiary.part3.join("\n") : ""}
", + "We found that in addition to the dailynote document conflict, the parent document at the upper level seems to be in conflict as well, and \"Auto Merge\" cannot handle this complexity of merging document trees.", + "
", + "", + "Of course, you can still to use the \"Auto Merge\" feature to merge dailynote, but it is recommended that you manually deal with duplicate parent documents after auto-merging.", + "
" + ], "AutoMerge": "Auto merge", "HeadingMarkdown": "# Duplicate diaries are listed below", "success": "Merge success", diff --git a/src/i18n/zh_CN.json b/src/i18n/zh_CN.json index 820df4d..ba42b18 100644 --- a/src/i18n/zh_CN.json +++ b/src/i18n/zh_CN.json @@ -142,6 +142,14 @@ "- 应该如何处理?", " 请自行合并删除多余的日记: 打开今日的日记, 然后定位日记文档, 冲突的文档就在一旁" ], + "part3": [ + "", + "我们发现除了日记文档冲突外,上层的父文档似乎也出现了冲突,「自动合并」无法处理这种合并文档树的复杂情况。", + "
", + "", + "当然,你可以继续使用「自动合并」功能来合并今日日记的文档,但是建议你在自动合并后手动处理一下重复的父文档。", + "
" + ], "AutoMerge": "自动合并", "HeadingMarkdown": "# 以下为其他重复的日记", "success": "自动合并成功",