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 #89707

Browse Source
This commit is contained in:
Sandeep Somavarapu
2020-01-30 19:23:22 +01:00
parent 1b0dce4548
commit 8e526ac73e
10 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,8 +84,8 @@ export class SettingsSyncService extends Disposable implements ISettingsSyncServ
return this.channel.call('hasLocalData');
}
resolveConflicts(content: string): Promise<void> {
return this.channel.call('resolveConflicts', [content]);
resolveConflicts(content: string, remote: boolean): Promise<void> {
return this.channel.call('resolveConflicts', [content, remote]);
}
resolveSettingsConflicts(conflicts: { key: string, value: any | undefined }[]): Promise<void> {

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

@@ -49,8 +49,8 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
return this.channel.call('sync');
}
resolveConflictsAndContinueSync(content: string): Promise<void> {
return this.channel.call('resolveConflictsAndContinueSync', [content]);
resolveConflictsAndContinueSync(content: string, remote: boolean): Promise<void> {
return this.channel.call('resolveConflictsAndContinueSync', [content, remote]);
}
reset(): Promise<void> {