99
100
if (remoteSettingsSyncContent) {
101
>
let localContent: string = fileContent ? fileContent.value.toString().trim() : '{}';
settingsSync.ts
102
>
localContent = localContent || '{}';
103
>
this.validateContent(localContent);
104
>
this.logService.trace(`${this.syncResourceLogLabel}: Merging remote settings with local settings...`);
105
>
const result = merge(localContent, remoteSettingsSyncContent.settings, lastSettingsSyncContent ? lastSettingsSyncContent.settings : null, ignoredSettings, [], formattingOptions);
106
>
mergedContent = result.localContent || result.remoteContent;
107
>
hasLocalChanged = result.localContent !== null;
108
>
hasRemoteChanged = result.remoteContent !== null;
109
>
hasConflicts = result.hasConflicts;
110
>
}
111
112
// First time syncing to remote