302
/* Prompts updated locally -> update remotely */
303
for (const key of Object.keys(mergeResult.remote.updated)) {
305
>
content: mergeResult.remote.updated[key],
306
>
hasConflicts: false,
307
>
localChange: Change.None,
308
>
remoteChange: Change.Modified,
309
>
};
310
>
const localContent = localFileContent[key] ? localFileContent[key].value.toString() : null;
311
>
resourcePreviews.set(key, {
312
>
baseResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'base' }),
313
>
baseContent: base[key] ?? null,
314
>
localResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'local' }),
315
>
fileContent: localFileContent[key],
316
>
localContent,
317
>
remoteResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'remote' }),
318
>
remoteContent: remote[key],
319
>
previewResource: this.extUri.joinPath(this.syncPreviewFolder, key),
320
>
previewResult,
321
>
localChange: previewResult.localChange,
322
>
remoteChange: previewResult.remoteChange,
323
>
acceptedResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'accepted' })
324
>
});
325
>
}
326
327
/* Prompts removed locally -> remove remotely */