Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 11:38:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

💄

Browse Source
This commit is contained in:
Sandeep Somavarapu
2020-08-05 22:08:27 +02:00
parent 35fefc46ae
commit 5315ff624b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
View File

@@ -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';