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 --- docs/dev/roadmap.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/dev/roadmap.md b/docs/dev/roadmap.md index 276e6c5..e4b2151 100644 --- a/docs/dev/roadmap.md +++ b/docs/dev/roadmap.md @@ -158,7 +158,7 @@ Smaller features first to enable early MVP validation. - [x] Client: Sync queue management - [x] Client: Push implementation - [x] Client: Pull implementation -- [ ] Conflict resolution (Last-Write-Wins) +- [x] Conflict resolution (Last-Write-Wins) - [ ] Auto-sync on reconnect - [ ] Add tests -- cgit v1.2.3-70-g09d2