feat: 使用持久选择解决 Sync 冲突并支持重启恢复

2026-09-08 15:50:31 +08:00
parent 251d3bac7d
commit 3a4d6e5586
8 changed files with 572 additions and 11 deletions
@@ -236,6 +236,7 @@ impl SyncClient {
        }
        identifier(&binding.remote_vault)?;
        let job = workspace.access(|ws| {
+            ws.sync_resume_resolutions(&binding.id)?;
            ws.sync_capture(&binding.id)?;
            ws.sync_next(&binding.id)
        })?;
@@ -272,6 +273,7 @@ impl SyncClient {
        }
        identifier(&binding.remote_vault)?;
        workspace.access(|ws| {
+            ws.sync_resume_resolutions(&binding.id)?;
            while ws.sync_apply_pending(&binding.id)? {}
            Ok(())
        })?;