Add command to resolve conflicts

microsoft · Sep 12, 2019 · 165f2b0 · 165f2b0
1 parent cf0d5ff
commit 165f2b0
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/vs/workbench/contrib/userData/common/userData.contribution.ts b/src/vs/workbench/contrib/userData/common/userData.contribution.ts
@@ -150,7 +150,7 @@ class SyncContribution extends Disposable implements IWorkbenchContribution {
 			when: CONTEXT_SYNC_STATE.isEqualTo(SyncStatus.Syncing)
 		});
 
-		// Command Pallette Action
+		// Command Pallette Actions
 
 		CommandsRegistry.registerCommand('workbench.userData.actions.startSync', serviceAccessor => serviceAccessor.get(IUserDataSyncService).sync());
 		MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
@@ -160,6 +160,14 @@ class SyncContribution extends Disposable implements IWorkbenchContribution {
 			},
 			when: ContextKeyExpr.and(CONTEXT_SYNC_STATE.isEqualTo(SyncStatus.Idle), ContextKeyExpr.not('config.userConfiguration.autoSync')),
 		});
+
+		MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+			command: {
+				id: 'sync.resolveConflicts',
+				title: localize('resolveConflicts', "Sync: Resolve Conflicts"),
+			},
+			when: CONTEXT_SYNC_STATE.isEqualTo(SyncStatus.HasConflicts),
+		});
 	}
 }