From 2da780a04e343eb75fbf364608396ae0fa447974 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Sat, 9 Nov 2024 15:09:53 +0800
Subject: [PATCH] :art: Improve data synchronization to reduce the probability
 of conflicts https://github.com/siyuan-note/siyuan/issues/13065

---
 kernel/model/repository.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kernel/model/repository.go b/kernel/model/repository.go
index d5cc82a60..e85af5597 100644
--- a/kernel/model/repository.go
+++ b/kernel/model/repository.go
@@ -645,6 +645,7 @@ func checkoutRepo(id string) {
 
 	// 回滚快照时默认为当前数据创建一个快照
 	// When rolling back a snapshot, a snapshot is created for the current data by default https://github.com/siyuan-note/siyuan/issues/12470
+	FlushTxQueue()
 	_, err = repo.Index("Backup before checkout", map[string]interface{}{eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBarAndProgress})
 	if err != nil {
 		logging.LogErrorf("index repository failed: %s", err)
@@ -1627,7 +1628,9 @@ var promotedPurgeDataRepo bool
 
 func indexRepoBeforeCloudSync(repo *dejavu.Repo) (beforeIndex, afterIndex *entity.Index, err error) {
 	start := time.Now()
+
 	beforeIndex, _ = repo.Latest()
+	FlushTxQueue()
 	afterIndex, err = repo.Index("[Sync] Cloud sync", map[string]interface{}{
 		eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBar,
 	})