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

🎨 云端同步冲突时支持设置是否产生冲突文档 https://github.com/siyuan-note/siyuan/issues/6110

Browse source
This commit is contained in:
Liang Ding 2022-10-09 10:36:41 +08:00
parent 6e7e154a3c
commit 698f773ee2
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
9 changed files with 43 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/model/repository.go
View file

@ -541,7 +541,7 @@ func syncRepo(boot, exit, byHand bool) (err error) {
logSyncMergeResult(mergeResult)
if 0 < len(mergeResult.Conflicts) {
if 0 < len(mergeResult.Conflicts) && Conf.Sync.GenerateConflictDoc {
// 云端同步发生冲突时生成副本 https://github.com/siyuan-note/siyuan/issues/5687
luteEngine := NewLute()

9
kernel/model/sync.go
View file

@ -216,6 +216,15 @@ func SetCloudSyncDir(name string) {
Conf.Save()
}
func SetSyncGenerateConflictDoc(b bool) {
syncLock.Lock()
defer syncLock.Unlock()
Conf.Sync.GenerateConflictDoc = b
Conf.Save()
return
}
func SetSyncEnable(b bool) (err error) {
syncLock.Lock()
defer syncLock.Unlock()