Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-22 16:26:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 云端同步冲突时支持设置是否产生冲突文档 https://github.com/siyuan-note/siyuan/issues/6110

Browse source
This commit is contained in:
Liang Ding 2022-10-09 10:45:46 +08:00
parent c0164f102f
commit 687dac7ba8
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
3 changed files with 15 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20210721112206-mhr9wxi.sy
View file

@ -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"
}
]
}

19
app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20210721103420-vn6g2yy.sy
View file

@ -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 的历史"
}
]
}

19
app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20211226121438-xaafdo8.sy
View file

@ -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 的歷史"
}
]
}