Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-09-22 00:20:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Improve data sync to avoid conflicts caused by folding block https://github.com/siyuan-note/siyuan/issues/15329#issuecomment-3152964043

Browse source
This commit is contained in:
Daniel 2025-08-05 11:08:34 +08:00
parent 34e3dfe479
commit 5690081332
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
kernel/model/repository.go
View file

@ -1526,8 +1526,13 @@ func processSyncMergeResult(exit, byHand bool, mergeResult *dejavu.MergeResult,
tree.Box = boxID
tree.Path = strings.TrimPrefix(file.Path, "/"+boxID)
previousPath := tree.Path
resetTree(tree, "Conflicted", true)
createTreeTx(tree)
box := Conf.Box(boxID)
if nil != box {
box.addSort(previousPath, tree.ID)
}
}
needReloadFiletree = true