227
/* Prompts updated remotely -> update locally */
228
for (const key of Object.keys(mergeResult.local.updated)) {
230
>
content: mergeResult.local.updated[key],
231
>
hasConflicts: false,
232
>
localChange: Change.Modified,
233
>
remoteChange: Change.None,
234
>
};
235
>
const localContent = localFileContent[key] ? localFileContent[key].value.toString() : null;
236
>
resourcePreviews.set(key, {
237
>
baseResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'base' }),
238
>
baseContent: base[key] ?? null,
239
>
localResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'local' }),
240
>
fileContent: localFileContent[key],
241
>
localContent,
242
>
remoteResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'remote' }),
243
>
remoteContent: remote[key],
244
>
previewResource: this.extUri.joinPath(this.syncPreviewFolder, key),
245
>
previewResult,
246
>
localChange: previewResult.localChange,
247
>
remoteChange: previewResult.remoteChange,
248
>
acceptedResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'accepted' })
249
>
});
250
>
}
251
252
/* Prompts removed remotely -> remove locally */