aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/client/sync/push.ts
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/sync/push.ts')
-rw-r--r--src/client/sync/push.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/sync/push.ts b/src/client/sync/push.ts
index eea671b..61c7f30 100644
--- a/src/client/sync/push.ts
+++ b/src/client/sync/push.ts
@@ -381,7 +381,7 @@ export function pendingChangesToPushData(
* 2. Convert to API format
* 3. Send to server
* 4. Mark items as synced on success
- * 5. Handle conflicts (server wins for LWW)
+ * 5. Handle conflicts using CRDT merge (fallback to server_wins)
*/
export class PushService {
private syncQueue: SyncQueue;