561
});
562
}
564
>
/* Changed -> Apply ? (Merge ? Conflict | Accept) : Preview */
565
>
else {
566
>
/* Merge */
567
>
const mergeResult = merge ? await this.getMergeResult(resourcePreviewResult, token) : undefined;
568
>
if (token.isCancellationRequested) {
569
break;
570
}
571
>
await this.fileService.writeFile(resourcePreviewResult.previewResource, VSBuffer.fromString(mergeResult?.content || ''));
abstractSynchronizer.ts
572
>
573
>
/* Conflict | Accept */
574
>
const acceptResult = mergeResult && !mergeResult.hasConflicts
575
/* Accept if merged and there are no conflicts */
576
? await this.getAcceptResult(resourcePreviewResult, resourcePreviewResult.previewResource, undefined, token)
577
: undefined;
579
>
resourcePreviews.push({
580
>
...resourcePreviewResult,
581
>
acceptResult,
582
>
mergeState: mergeResult?.hasConflicts ? MergeState.Conflict : acceptResult ? MergeState.Accepted : MergeState.Preview,
583
>
localChange: acceptResult ? acceptResult.localChange : mergeResult ? mergeResult.localChange : resourcePreviewResult.localChange,
584
>
remoteChange: acceptResult ? acceptResult.remoteChange : mergeResult ? mergeResult.remoteChange : resourcePreviewResult.remoteChange
585
>
});
586
>
}
587
}
588