327
/* Prompts removed locally -> remove remotely */
328
for (const key of mergeResult.remote.removed) {
330
>
content: null,
331
>
hasConflicts: false,
332
>
localChange: Change.None,
333
>
remoteChange: Change.Deleted,
334
>
};
335
>
resourcePreviews.set(key, {
336
>
baseResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'base' }),
337
>
baseContent: base[key] ?? null,
338
>
localResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'local' }),
339
>
fileContent: null,
340
>
localContent: null,
341
>
remoteResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'remote' }),
342
>
remoteContent: remote[key],
343
>
previewResource: this.extUri.joinPath(this.syncPreviewFolder, key),
344
>
previewResult,
345
>
localChange: previewResult.localChange,
346
>
remoteChange: previewResult.remoteChange,
347
>
acceptedResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'accepted' })
348
>
});
349
>
}
350
351
/* Prompts with conflicts */