aboutsummaryrefslogtreecommitdiffhomepage
path: root/docs
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2025-12-07 19:32:36 +0900
committernsfisis <nsfisis@gmail.com>2025-12-07 19:32:36 +0900
commit8ef0e4a54986f7e334136d195b7081f176de0282 (patch)
tree956da5f24a4c36055939f183dc68f5a5a55e4aa9 /docs
parent864495bd4d7156ee433cbc12adda4bdebd43f6fe (diff)
downloadkioku-8ef0e4a54986f7e334136d195b7081f176de0282.tar.gz
kioku-8ef0e4a54986f7e334136d195b7081f176de0282.tar.zst
kioku-8ef0e4a54986f7e334136d195b7081f176de0282.zip
feat(client): add conflict resolution for offline sync
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 <noreply@anthropic.com>
Diffstat (limited to 'docs')
-rw-r--r--docs/dev/roadmap.md2
1 files changed, 1 insertions, 1 deletions
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