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

kernel/model/osssync.go

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