Merge branch 'BuraChuhadar-Feature-30055'

extensions/git/src/commands.ts

@@ -454,8 +454,26 @@ export class CommandCenter {
 			resourceStates = [resource];
 		}
 
-		const scmResources = resourceStates
-			.filter(s => s instanceof Resource && (s.resourceGroupType === ResourceGroupType.WorkingTree || s.resourceGroupType === ResourceGroupType.Merge)) as Resource[];
+		const selection = resourceStates.filter(s => s instanceof Resource) as Resource[];
+		const mergeConflicts = selection.filter(s => s.resourceGroupType === ResourceGroupType.Merge);
+
+		if (mergeConflicts.length > 0) {
+			const message = mergeConflicts.length > 1
+				? localize('confirm stage files with merge conflicts', "Are you sure you want to stage {0} files with merge conflicts?", mergeConflicts.length)
+				: localize('confirm stage file with merge conflicts', "Are you sure you want to stage {0} with merge conflicts?", path.basename(mergeConflicts[0].resourceUri.fsPath));
+
+			const yes = localize('yes', "Yes");
+			const pick = await window.showWarningMessage(message, { modal: true }, yes);
+
+			if (pick !== yes) {
+				return;
+			}
+		}
+
+		const workingTree = selection
+			.filter(s => s.resourceGroupType === ResourceGroupType.WorkingTree);
+
+		const scmResources = [...workingTree, ...mergeConflicts];
 
 		if (!scmResources.length) {
 			return;
@@ -467,6 +485,22 @@ export class CommandCenter {
 
 	@command('git.stageAll', { repository: true })
 	async stageAll(repository: Repository): Promise<void> {
+		const resources = repository.mergeGroup.resourceStates.filter(s => s instanceof Resource) as Resource[];
+		const mergeConflicts = resources.filter(s => s.resourceGroupType === ResourceGroupType.Merge);
+
+		if (mergeConflicts.length > 0) {
+			const message = mergeConflicts.length > 1
+				? localize('confirm stage files with merge conflicts', "Are you sure you want to stage {0} files with merge conflicts?", mergeConflicts.length)
+				: localize('confirm stage file with merge conflicts', "Are you sure you want to stage {0} with merge conflicts?", path.basename(mergeConflicts[0].resourceUri.fsPath));
+
+			const yes = localize('yes', "Yes");
+			const pick = await window.showWarningMessage(message, { modal: true }, yes);
+
+			if (pick !== yes) {
+				return;
+			}
+		}
+
 		await repository.add([]);
 	}