github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-21 11:30:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Liang Ding 2022-08-21 13:02:04 +08:00
parent 581c1b4942
commit 6fa5f21dbb
No known key found for this signature in database
GPG Key ID: 136F30F901A2231D
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/model/repository.go
View File

@ -553,7 +553,7 @@ func syncRepo(boot, exit, byHand bool) (err error) {
absPath := filepath.Join(util.TempDir, "repo", "sync", "conflicts", file.Path)
tree, loadTreeErr := loadTree(absPath, luteEngine)
if nil != loadTreeErr {
logging.LogErrorf("loadd conflicted file [%s] failed: %s", absPath, loadTreeErr)
logging.LogErrorf("load conflicted file [%s] failed: %s", absPath, loadTreeErr)
continue
}
tree.Box = boxID