From 687dac7ba88bee20e9d29e85f173e55707a7a770 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sun, 9 Oct 2022 10:45:46 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BA=91=E7=AB=AF=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=86=B2=E7=AA=81=E6=97=B6=E6=94=AF=E6=8C=81=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=BA=A7=E7=94=9F=E5=86=B2=E7=AA=81=E6=96=87?= =?UTF-8?q?=E6=A1=A3=20https://github.com/siyuan-note/siyuan/issues/6110?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20210721112206-mhr9wxi.sy | 19 +++++-------------- .../20210721103420-vn6g2yy.sy | 19 +++++-------------- .../20211226121438-xaafdo8.sy | 19 +++++-------------- 3 files changed, 15 insertions(+), 42 deletions(-) diff --git a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20210721112206-mhr9wxi.sy b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20210721112206-mhr9wxi.sy index 5b1f6ad8e..a3fe2a0e0 100644 --- a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20210721112206-mhr9wxi.sy +++ b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20210721112206-mhr9wxi.sy @@ -5,7 +5,7 @@ "Properties": { "id": "20210721112206-mhr9wxi", "title": "Data sync", - "updated": "20220831004508" + "updated": "20221009104451" }, "Children": [ { @@ -685,7 +685,7 @@ }, "Properties": { "id": "20220703232421-gmxxahn", - "updated": "20220821165444" + "updated": "20221009104451" }, "Children": [ { @@ -759,7 +759,7 @@ }, "Properties": { "id": "20220703232421-axvmpcs", - "updated": "20220821165444" + "updated": "20221009104451" }, "Children": [ { @@ -767,21 +767,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20220703232421-r4nw5op", - "updated": "20220821165444" + "updated": "20221009104451" }, "Children": [ { "Type": "NodeText", - "Data": "At this time, the cloud file a will be overwritten by a of the B device, and the history of the previous A device file a will be generated on the B device. If the file a is a document, a copy of the document (with " - }, - { - "Type": "NodeTextMark", - "TextMarkType": "code", - "TextMarkTextContent": "(Conflicted 2006-01-02 15:04:05)" - }, - { - "Type": "NodeText", - "Data": " as the document name suffix) will be generated in the same level directory at the same time as the history is generated, so as to facilitate subsequent manual edit merge conflicts" + "Data": "At this time, the cloud file a will be overwritten by a of the B device, and the history of the previous A device file a will be generated on the B device" } ] } diff --git a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20210721103420-vn6g2yy.sy b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20210721103420-vn6g2yy.sy index 53dd61d30..dcba42e24 100644 --- a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20210721103420-vn6g2yy.sy +++ b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20210721103420-vn6g2yy.sy @@ -5,7 +5,7 @@ "Properties": { "id": "20210721103420-vn6g2yy", "title": "数据同步", - "updated": "20220831004438" + "updated": "20221009104351" }, "Children": [ { @@ -726,7 +726,7 @@ }, "Properties": { "id": "20220307093112-lz7p32d", - "updated": "20220821165223" + "updated": "20221009104351" }, "Children": [ { @@ -799,7 +799,7 @@ }, "Properties": { "id": "20220307094021-74y5lau", - "updated": "20220821165223" + "updated": "20221009104351" }, "Children": [ { @@ -807,21 +807,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20220307094021-jtlbgw4", - "updated": "20220821165223" + "updated": "20221009104351" }, "Children": [ { "Type": "NodeText", - "Data": "此时云端 a 文件会被 B 设备上的 a 覆盖，同时在 B 设备上生成之前 A 设备 a 的历史。如果 a 文件是文档的话，生成历史的同时也会在同级目录下生成该文档的副本（以 " - }, - { - "Type": "NodeTextMark", - "TextMarkType": "code", - "TextMarkTextContent": "(Conflicted 2006-01-02 15:04:05)" - }, - { - "Type": "NodeText", - "Data": " 作为文档名后缀），以方便后续手动编辑合并冲突" + "Data": "此时云端 a 文件会被 B 设备上的 a 覆盖，同时在 B 设备上生成之前 A 设备 a 的历史" } ] } diff --git a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20211226121438-xaafdo8.sy b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20211226121438-xaafdo8.sy index 8988a0cf9..ff3fa8b51 100644 --- a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20211226121438-xaafdo8.sy +++ b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20211226121438-xaafdo8.sy @@ -5,7 +5,7 @@ "Properties": { "id": "20211226121438-xaafdo8", "title": "資料同步", - "updated": "20220831004450" + "updated": "20221009104430" }, "Children": [ { @@ -706,7 +706,7 @@ }, "Properties": { "id": "20220703231640-9pkvgzl", - "updated": "20220821165506" + "updated": "20221009104430" }, "Children": [ { @@ -780,7 +780,7 @@ }, "Properties": { "id": "20220703231640-ytzbgh6", - "updated": "20220821165506" + "updated": "20221009104430" }, "Children": [ { @@ -788,21 +788,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20220703231640-qqg6ca6", - "updated": "20220821165506" + "updated": "20221009104430" }, "Children": [ { "Type": "NodeText", - "Data": "此時雲端 a 文件會被 B 設備上的 a 覆蓋，同時在 B 設備上生成之前 A 設備 a 的歷史。如果 a 文件是文檔的話，生成歷史的同時也會在同級目錄下生成該文檔的副本（以 " - }, - { - "Type": "NodeTextMark", - "TextMarkType": "code", - "TextMarkTextContent": "(Conflicted 2006-01-02 15:04:05)" - }, - { - "Type": "NodeText", - "Data": " 作為文檔名後綴），以方便後續手動編輯合併衝突" + "Data": "此時雲端 a 文件會被 B 設備上的 a 覆蓋，同時在 B 設備上生成之前 A 設備 a 的歷史" } ] }