public/obsidian-livesync
1
0 Fork 0
mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2026-11-06 00:08:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cancel stale conflict resolutions when queueing checks

Browse Source
This commit is contained in:
vorotamoroz committed 2026-11-01 08:53:13 +00:00
1 parent 17d1e3f50a
commit 8844a88399
4 files changed
+108 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/serviceFeatures/conflictResolution/index.ts
+1
View File
@@ -34,6 +34,7 @@ export const useConflictResolutionFeature = createServiceFeature((host: Conflict
const checking = createConflictCheckingHandlers({
conflict: services.conflict,
conflictProcessQueueCount: services.conflict.conflictProcessQueueCount,
cancelActiveResolution: operations.cancelActiveResolution,
currentSettings: () => services.setting.currentSettings(),
vault: services.vault,
log,