423
424
async discard(resource: URI): Promise<ISyncResourcePreview | null> {
426
>
const mergeResult = await this.getMergeResult(resourcePreview, CancellationToken.None);
427
>
await this.fileService.writeFile(resourcePreview.previewResource, VSBuffer.fromString(mergeResult.content || ''));
428
>
resourcePreview.acceptResult = undefined;
429
>
resourcePreview.mergeState = MergeState.Preview;
430
>
resourcePreview.localChange = mergeResult.localChange;
431
>
resourcePreview.remoteChange = mergeResult.remoteChange;
432
>
return resourcePreview;
433
>
});
434
>
return this.syncPreviewPromise;
435
>
}
436
437
private async updateSyncResourcePreview(resource: URI, updateResourcePreview: (resourcePreview: IEditableResourcePreview) => Promise<IEditableResourcePreview>): Promise<void> {