Merge branch 'main' into patch-1

Author: theNestruo

extensions/git/src/repository.ts

@@ -947,7 +947,7 @@ export class Repository implements Disposable {
 		const icon = repository.kind === 'submodule'
 			? new ThemeIcon('archive')
 			: repository.kind === 'worktree'
-				? new ThemeIcon('list-tree')
+				? new ThemeIcon('worktree')
 				: new ThemeIcon('repo');
 
 		const root = Uri.file(repository.root);

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