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

#100346 merge single resource

Browse Source
This commit is contained in:
Sandeep Somavarapu
2020-07-12 21:01:26 +02:00
parent 97bf8e14f5
commit 04aa49cbbe
4 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -181,12 +181,12 @@ class ManualSyncTask implements IManualSyncTask {
]));
}
accept(uri: URI, content: string): Promise<[SyncResource, ISyncResourcePreview][]> {
return this.channel.call('accept', [uri, content]);
accept(resource: URI, content: string): Promise<[SyncResource, ISyncResourcePreview][]> {
return this.channel.call('accept', [resource, content]);
}
merge(): Promise<[SyncResource, ISyncResourcePreview][]> {
return this.channel.call('merge');
merge(resource: URI): Promise<[SyncResource, ISyncResourcePreview][]> {
return this.channel.call('merge', [resource]);
}
pull(): Promise<void> {