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

#103863 update label

Browse Source
This commit is contained in:
Sandeep Somavarapu
2020-08-07 09:54:52 +02:00
parent 22700dd093
commit d890a22dc2
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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