From af21d8697a84b5e9fb6cea3ed64ad5771895e3da Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Fri, 19 Dec 2025 14:52:44 +0100 Subject: [PATCH] fix #284447 (#284449) --- .../platform/userDataSync/common/abstractJsonSynchronizer.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/vs/platform/userDataSync/common/abstractJsonSynchronizer.ts b/src/vs/platform/userDataSync/common/abstractJsonSynchronizer.ts index 954b2484e1c..66aa8c8b0ca 100644 --- a/src/vs/platform/userDataSync/common/abstractJsonSynchronizer.ts +++ b/src/vs/platform/userDataSync/common/abstractJsonSynchronizer.ts @@ -243,6 +243,11 @@ export abstract class AbstractJsonSynchronizer extends AbstractFileSynchroniser return { content: null, hasLocalChanged: false, hasRemoteChanged: false, hasConflicts: false }; } + // Normalize nulls to empty strings for easier comparison + originalRemoteContent = originalRemoteContent ?? ''; + originalLocalContent = originalLocalContent ?? ''; + baseContent = baseContent ?? ''; + /* no changes */ if (originalLocalContent === originalRemoteContent) { return { content: null, hasLocalChanged: false, hasRemoteChanged: false, hasConflicts: false };