Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-20 02:08:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix #284447 (#284449)

Browse Source
This commit is contained in:
Sandeep Somavarapu
2025-12-19 14:52:44 +01:00
committed by GitHub
parent 383949db0b
commit af21d8697a
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/vs/platform/userDataSync/common/abstractJsonSynchronizer.ts
View File

@@ -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 };