From 539e8f25b12d719084c8a986fcf65cf7848314b3 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Wed, 31 Dec 2025 18:40:56 +0900 Subject: refactor(sync): remove legacy conflict resolution strategies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/client/sync/manager.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/client/sync/manager.test.ts') 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 () => { -- cgit v1.2.3-70-g09d2