From d890a22dc21fed13cf5a9eed81780d700f6e4f32 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Fri, 7 Aug 2020 09:54:52 +0200 Subject: [PATCH] #103863 update label --- .../browser/userDataSyncWorkbenchService.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts b/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts index ea0aa094229..bdac6f7a6c6 100644 --- a/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts +++ b/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts @@ -331,9 +331,14 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat } }); if (manualSyncTask.status === SyncStatus.HasConflicts) { - await this.dialogService.show(Severity.Warning, localize('conflicts detected', "Conflicts Detected"), [], { - detail: localize('resolve', "Unable to merge due to conflicts. Please merge manually to continue...") - }); + await this.dialogService.show( + Severity.Warning, + localize('conflicts detected', "Conflicts Detected"), + [localize('merge Manually', "Merge Manually...")], + { + detail: localize('resolve', "Unable to merge due to conflicts. Please merge manually to continue..."), + } + ); await manualSyncTask.discardConflicts(); action = 'manual'; }