Merge pull request #173035 from microsoft/hediet/additional-giraffe

Shows "Accept Combination (Incoming first)" when combination is order-sensitive.
microsoft · Feb 1, 2023 · 54d3518 · 54d3518
2 parents ea52e5d + bcc4f80
commit 54d3518
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.ts
@@ -136,8 +136,12 @@ export class ActionsSource {
 					);
 
 					if (modifiedBaseRange.canBeCombined) {
+						const commandName = modifiedBaseRange.isOrderRelevant
+							? localize('acceptBoth0First', "Accept Combination ({0} First)", inputData.title)
+							: localize('acceptBoth', "Accept Combination");
+
 						result.push(
-							command(localize('acceptBoth', "Accept Combination"), async () => {
+							command(commandName, async () => {
 								transaction((tx) => {
 									model.setState(
 										modifiedBaseRange,