Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-01 22:38:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 The database-bound block is automatically added to the database after being copied as a replica https://github.com/siyuan-note/siyuan/issues/11959

Browse source
This commit is contained in:
Daniel 2024-07-24 11:23:21 +08:00
parent 74c6b9ba00
commit 9cc334698b
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
4 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/model/repository.go
View file

@ -1380,7 +1380,7 @@ func processSyncMergeResult(exit, byHand bool, mergeResult *dejavu.MergeResult,
tree.Box = boxID
tree.Path = strings.TrimPrefix(file.Path, "/"+boxID)
resetTree(tree, "Conflicted")
resetTree(tree, "Conflicted", true)
createTreeTx(tree)
}