aboutsummaryrefslogtreecommitdiffhomepage
path: root/docs/dev/roadmap.md
diff options
context:
space:
mode:
Diffstat (limited to 'docs/dev/roadmap.md')
-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 d17ba41..9251e15 100644
--- a/docs/dev/roadmap.md
+++ b/docs/dev/roadmap.md
@@ -24,7 +24,7 @@ Replace the current Last-Write-Wins (LWW) conflict resolution with Automerge CRD
### Phase 3: Modify Sync Protocol
- [x] Modify `src/client/sync/push.ts` - Add crdtChanges to push payload
-- [ ] Modify `src/client/sync/pull.ts` - Handle crdtChanges in pull response
+- [x] Modify `src/client/sync/pull.ts` - Handle crdtChanges in pull response
- [ ] Modify `src/client/sync/conflict.ts` - Replace LWW with Automerge merge
- [ ] Modify `src/client/sync/manager.ts` - Integrate CRDT sync flow