rollback changes to conflicts handling

sandy081 · sandy081 · commit 3d99a14dc4ff · 2020-08-06T02:30:19.000+02:00
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
@@ -212,14 +212,14 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 								}
 							},
 							{
-								label: localize('accept merges', "Accept Merges"),
+								label: localize('accept local', "Accept Local"),
 								run: () => {
 									this.telemetryService.publicLog2<{ source: string, action: string }, SyncConflictsClassification>('sync/handleConflicts', { source: syncResource, action: 'acceptLocal' });
 									this.acceptLocal(syncResource, conflicts);
 								}
 							},
 							{
-								label: localize('show merges', "Show Merges"),
+								label: localize('show conflicts', "Show Conflicts"),
 								run: () => {
 									this.telemetryService.publicLog2<{ source: string, action?: string }, SyncConflictsClassification>('sync/showConflicts', { source: syncResource });
 									this.handleConflicts([syncResource, conflicts]);
@@ -266,7 +266,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 	private async acceptLocal(syncResource: SyncResource, conflicts: IResourcePreview[]): Promise<void> {
 		try {
 			for (const conflict of conflicts) {
-				await this.userDataSyncService.accept(syncResource, conflict.previewResource, undefined, this.userDataAutoSyncService.isEnabled());
+				await this.userDataSyncService.accept(syncResource, conflict.localResource, undefined, this.userDataAutoSyncService.isEnabled());
 			}
 		} catch (e) {
 			this.notificationService.error(e);

Original file line number	Diff line number	Diff line change
`@@ -212,14 +212,14 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo`
`212`	`212`	`}`
`213`	`213`	`},`
`214`	`214`	`{`
`215`		`- label: localize('accept merges', "Accept Merges"),`
	`215`	`+ label: localize('accept local', "Accept Local"),`
`216`	`216`	`run: () => {`
`217`	`217`	`this.telemetryService.publicLog2<{ source: string, action: string }, SyncConflictsClassification>('sync/handleConflicts', { source: syncResource, action: 'acceptLocal' });`
`218`	`218`	`this.acceptLocal(syncResource, conflicts);`
`219`	`219`	`}`
`220`	`220`	`},`
`221`	`221`	`{`
`222`		`- label: localize('show merges', "Show Merges"),`
	`222`	`+ label: localize('show conflicts', "Show Conflicts"),`
`223`	`223`	`run: () => {`
`224`	`224`	`this.telemetryService.publicLog2<{ source: string, action?: string }, SyncConflictsClassification>('sync/showConflicts', { source: syncResource });`
`225`	`225`	`this.handleConflicts([syncResource, conflicts]);`
`@@ -266,7 +266,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo`
`266`	`266`	`private async acceptLocal(syncResource: SyncResource, conflicts: IResourcePreview[]): Promise<void> {`
`267`	`267`	`try {`
`268`	`268`	`for (const conflict of conflicts) {`
`269`		`- await this.userDataSyncService.accept(syncResource, conflict.previewResource, undefined, this.userDataAutoSyncService.isEnabled());`
	`269`	`+ await this.userDataSyncService.accept(syncResource, conflict.localResource, undefined, this.userDataAutoSyncService.isEnabled());`
`270`	`270`	`}`
`271`	`271`	`} catch (e) {`
`272`	`272`	`this.notificationService.error(e);`