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

kernel/model/sync.go

@@ -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()