Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 23:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 支持多设备操作不同文档后云端同步合并 https://github.com/siyuan-note/siyuan/issues/5092

Browse source
This commit is contained in:
Liang Ding 2022-06-06 11:46:32 +08:00
parent 2dfad9d996
commit 0a1fcd7910
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
kernel/model/osssync.go
View file

@ -205,6 +205,9 @@ func ossDownload(isBackup bool, localDirPath, cloudDirPath string, bootOrExit bo
var tmpWroteFiles int var tmpWroteFiles int
var tmpTransferSize uint64 var tmpTransferSize uint64
for upsert, _ := range upsertList { for upsert, _ := range upsertList {
if "/.siyuan/conf.json" == upsert { // 版本号不覆盖云端
continue
}
localUpsert := filepath.Join(localDirPath, upsert) localUpsert := filepath.Join(localDirPath, upsert)
var info os.FileInfo var info os.FileInfo
info, err = os.Stat(localUpsert) info, err = os.Stat(localUpsert)