466
467
private async doApply(force: boolean): Promise<SyncStatus> {
469
return SyncStatus.Idle;
470
}
472
>
const preview = await this.syncPreviewPromise;
473
>
474
>
// check for conflicts
475
>
if (preview.resourcePreviews.some(({ mergeState }) => mergeState === MergeState.Conflict)) {
476
return SyncStatus.HasConflicts;
477
}
479
>
// check if all are accepted
480
>
if (preview.resourcePreviews.some(({ mergeState }) => mergeState !== MergeState.Accepted)) {
481
return SyncStatus.Syncing;
482
}
484
>
// apply preview
485
>
await this.applyResult(preview.remoteUserData, preview.lastSyncUserData, preview.resourcePreviews.map(resourcePreview => ([resourcePreview, resourcePreview.acceptResult!])), force);
486
487
// reset preview