Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-18 04:58:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🐛 同步生成冲突文档报错 Fix https://github.com/siyuan-note/siyuan/issues/5739

Browse source
This commit is contained in:
Liang Ding 2022-08-28 14:44:31 +08:00
parent b508abd31d
commit 18f490baa5
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/model/repository.go
View file

@ -556,7 +556,7 @@ func syncRepo(boot, exit, byHand bool) (err error) {
}
boxID := parts[0]
absPath := filepath.Join(util.TempDir, "repo", "sync", "conflicts", file.Path)
absPath := filepath.Join(util.TempDir, "repo", "sync", "conflicts", mergeResult.Time.Format("2006-01-02-150405"), file.Path)
tree, loadTreeErr := loadTree(absPath, luteEngine)
if nil != loadTreeErr {
logging.LogErrorf("load conflicted file [%s] failed: %s", absPath, loadTreeErr)