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

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2022-09-02 10:16:57 +08:00
commit 424ea9b1ca
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kernel/model/repository.go
View file

@ -633,6 +633,10 @@ func syncRepo(boot, exit, byHand bool) (err error) {
}
func logSyncMergeResult(mergeResult *dejavu.MergeResult) {
if 1 > len(mergeResult.Conflicts) && 1 > len(mergeResult.Upserts) && 1 > len(mergeResult.Removes) {
return
}
logging.LogInfof("sync merge result [conflicts=%d, upserts=%d, removes=%d]", len(mergeResult.Conflicts), len(mergeResult.Upserts), len(mergeResult.Removes))
if 0 < len(mergeResult.Conflicts) {
logBuilder := bytes.Buffer{}