351
/* Prompts with conflicts */
352
for (const key of mergeResult.conflicts) {
354
>
content: base[key] ?? null,
355
>
hasConflicts: true,
356
>
localChange: localFileContent[key] ? Change.Modified : Change.Added,
357
>
remoteChange: remote[key] ? Change.Modified : Change.Added
358
>
};
359
>
const localContent = localFileContent[key] ? localFileContent[key].value.toString() : null;
360
>
resourcePreviews.set(key, {
361
>
baseResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'base' }),
362
>
baseContent: base[key] ?? null,
363
>
localResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'local' }),
364
>
fileContent: localFileContent[key] || null,
365
>
localContent,
366
>
remoteResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'remote' }),
367
>
remoteContent: remote[key] || null,
368
>
previewResource: this.extUri.joinPath(this.syncPreviewFolder, key),
369
>
previewResult,
370
>
localChange: previewResult.localChange,
371
>
remoteChange: previewResult.remoteChange,
372
>
acceptedResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'accepted' })
373
>
});
374
>
}
375
376
/* Unmodified Prompts */