Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-03 15:28:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 云端同步发生冲突时生成副本 https://github.com/siyuan-note/siyuan/issues/5687

Browse source
This commit is contained in:
Liang Ding 2022-08-21 13:41:35 +08:00
parent 6fa5f21dbb
commit b846e3d1b1
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/model/repository.go
View file

@ -568,7 +568,7 @@ func syncRepo(boot, exit, byHand bool) (err error) {
}
}
if 1 > len(mergeResult.Upserts) && 1 > len(mergeResult.Removes) { // 没有数据变更
if 1 > len(mergeResult.Upserts) && 1 > len(mergeResult.Removes) && 1 > len(mergeResult.Conflicts) { // 没有数据变更
syncSameCount++
if 10 < syncSameCount {
syncSameCount = 5