💄

sandy081 · sandy081 · commit 5315ff624bd1 · 2020-08-05T22:08:27.000+02:00
diff --git a/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts b/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
@@ -304,7 +304,7 @@ 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 resolve them to continue.")
+					detail: localize('resolve', "Unable to merge due to conflicts. Please merge manually to continue...")
 				});
 				await manualSyncTask.discardConflicts();
 				action = 'manual';
