Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 03:29:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #99764

Browse Source
This commit is contained in:
Sandeep Somavarapu
2020-06-10 21:02:30 +02:00
parent 562fa11e96
commit d335d3639c
2 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
View File

@@ -239,8 +239,10 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
private async handleFirstTimeSync(): Promise<void> {
const isFirstTimeSyncingWithAnotherMachine = await this.userDataSyncService.isFirstTimeSyncingWithAnotherMachine();
if (!isFirstTimeSyncingWithAnotherMachine) {
await this.userDataSyncService.sync();
return;
}
const result = await this.dialogService.show(
Severity.Info,
localize('Replace or Merge', "Replace or Merge"),
@@ -262,6 +264,7 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
throw canceled();
case 1:
this.telemetryService.publicLog2<{ action: string }, FirstTimeSyncClassification>('sync/firstTimeSync', { action: 'merge' });
await this.userDataSyncService.sync();
break;
case 2:
this.telemetryService.publicLog2<{ action: string }, FirstTimeSyncClassification>('sync/firstTimeSync', { action: 'replace-local' });