From 4755779975a140660e66acfcec2cc899179b0b71 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Wed, 31 Dec 2025 18:25:56 +0900 Subject: refactor(sync): remove legacy LWW conflict resolution strategy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove the deprecated "newer_wins" strategy from the conflict resolver as CRDT is now the default and validated approach. The system now uses only "crdt", "server_wins", and "local_wins" strategies. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 --- src/client/sync/push.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/client/sync/push.ts') 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; -- cgit v1.2.3-70-g09d2