aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/client/sync/manager.test.ts
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2025-12-31 18:40:56 +0900
committernsfisis <nsfisis@gmail.com>2025-12-31 18:41:36 +0900
commit539e8f25b12d719084c8a986fcf65cf7848314b3 (patch)
tree3e12eeb5a26b1cb33298ea9e54280461e1128f84 /src/client/sync/manager.test.ts
parent4755779975a140660e66acfcec2cc899179b0b71 (diff)
downloadkioku-539e8f25b12d719084c8a986fcf65cf7848314b3.tar.gz
kioku-539e8f25b12d719084c8a986fcf65cf7848314b3.tar.zst
kioku-539e8f25b12d719084c8a986fcf65cf7848314b3.zip
refactor(sync): remove legacy conflict resolution strategies
Remove the unused "local_wins" strategy and ConflictResolverOptions interface from ConflictResolver. The CRDT-based conflict resolution now always uses Automerge merge with server_wins fallback when CRDT data is unavailable. This simplifies the codebase by removing configuration options that were never used in production. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Diffstat (limited to 'src/client/sync/manager.test.ts')
-rw-r--r--src/client/sync/manager.test.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/sync/manager.test.ts b/src/client/sync/manager.test.ts
index 0758261..8af6e6f 100644
--- a/src/client/sync/manager.test.ts
+++ b/src/client/sync/manager.test.ts
@@ -112,7 +112,7 @@ describe("SyncManager", () => {
...createEmptyPullResult(0),
} satisfies SyncPullResult);
- conflictResolver = new ConflictResolver({ strategy: "server_wins" });
+ conflictResolver = new ConflictResolver();
});
afterEach(async () => {