microsoft#103863 update label

sandy081 · sandy081 · commit d890a22dc21f · 2020-08-07T09:54:52.000+02:00
diff --git 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';
 			}
