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

Improve conflicts handling when local content changes

Browse Source
This commit is contained in:
Sandeep Somavarapu
2020-02-09 13:58:45 +01:00
parent fd2705396f
commit a63ce4df67
11 changed files with 117 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/vs/workbench/services/userDataSync/electron-browser/settingsSyncService.ts
View File

@@ -63,11 +63,6 @@ export class SettingsSyncService extends Disposable implements ISettingsSyncServ
return this.channel.call('stop');
}
async restart(): Promise<void> {
const status = await this.channel.call<SyncStatus>('restart');
await this.updateStatus(status);
}
resetLocal(): Promise<void> {
return this.channel.call('resetLocal');
}

5
src/vs/workbench/services/userDataSync/electron-browser/userDataSyncService.ts
View File

@@ -79,11 +79,6 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
return this.channel.call('stop');
}
async restart(source: SyncSource): Promise<void> {
const status = await this.channel.call<SyncStatus>('restart', [source]);
await this.updateStatus(status);
}
hasPreviouslySynced(): Promise<boolean> {
return this.channel.call('hasPreviouslySynced');
}