From 8ef0e4a54986f7e334136d195b7081f176de0282 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 7 Dec 2025 19:32:36 +0900 Subject: feat(client): add conflict resolution for offline sync MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Implement ConflictResolver class with Last-Write-Wins (LWW) strategy: - Detect conflicts from push results - Support multiple strategies: server_wins, local_wins, newer_wins - Resolve deck and card conflicts using server data from pull - Default to server_wins (LWW) for consistent conflict handling 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 --- src/client/sync/index.ts | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/client/sync/index.ts') diff --git a/src/client/sync/index.ts b/src/client/sync/index.ts index 80d0cc1..2472871 100644 --- a/src/client/sync/index.ts +++ b/src/client/sync/index.ts @@ -30,3 +30,12 @@ export { type ServerReviewLog, type SyncPullResult, } from "./pull"; + +export { + ConflictResolver, + conflictResolver, + createConflictResolver, + type ConflictResolutionItem, + type ConflictResolutionResult, + type ConflictResolverOptions, +} from "./conflict"; -- cgit v1.2.3-70-g09d2