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

🎨 数据同步发生冲突时在界面上进行提醒 https://github.com/siyuan-note/siyuan/issues/7332

Browse source
This commit is contained in:
Liang Ding 2023-02-11 11:52:03 +08:00
parent 3dbc6d91ed
commit f623210acd
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
8 changed files with 31 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
kernel/model/repository.go
View file

@ -1171,6 +1171,11 @@ func processSyncMergeResult(exit, byHand bool, start time.Time, mergeResult *dej
go func() {
time.Sleep(2 * time.Second)
util.PushStatusBar(fmt.Sprintf(Conf.Language(149), elapsed.Seconds()))
if 0 < len(mergeResult.Conflicts) {
// 数据同步发生冲突时在界面上进行提醒 https://github.com/siyuan-note/siyuan/issues/7332
util.PushMsg(Conf.Language(108), 7000)
}
}()
}
}