411
412
async accept(resource: URI, content?: string | null): Promise<ISyncResourcePreview | null> {
414
>
const acceptResult = await this.getAcceptResult(resourcePreview, resource, content, CancellationToken.None);
415
>
resourcePreview.acceptResult = acceptResult;
416
>
resourcePreview.mergeState = MergeState.Accepted;
417
>
resourcePreview.localChange = acceptResult.localChange;
418
>
resourcePreview.remoteChange = acceptResult.remoteChange;
419
>
return resourcePreview;
420
>
});
421
>
return this.syncPreviewPromise;
422
>
}
423
424
async discard(resource: URI): Promise<ISyncResourcePreview | null> {