Git - update context key for conflict resolution action (#1132)

lszomoru · web-flow · commit d55998a0c009 · 2025-09-24T15:48:11.000Z
diff --git a/package.json b/package.json
@@ -3554,7 +3554,7 @@
 			"scm/resourceState/context": [
 				{
 					"command": "github.copilot.git.resolveMergeConflicts",
-					"when": "scmProvider == git && scmResourceGroup == merge && mergeConflictsCount && mergeConflictsCount != 0",
+					"when": "scmProvider == git && scmResourceGroup == merge && git.activeResourceHasMergeConflicts",
 					"group": "z_chat@1"
 				},
 				{
@@ -3641,7 +3641,7 @@
 				{
 					"command": "github.copilot.git.resolveMergeConflicts",
 					"group": "z_chat@1",
-					"when": "config.git.enabled && !git.missing && !isInDiffEditor && !isMergeEditor && resource in git.mergeChanges && mergeConflictsCount && mergeConflictsCount != 0"
+					"when": "config.git.enabled && !git.missing && !isInDiffEditor && !isMergeEditor && resource in git.mergeChanges && git.activeResourceHasMergeConflicts"
 				}
 			]
 		},

Original file line number	Diff line number	Diff line change
`@@ -3554,7 +3554,7 @@`
`3554`	`3554`	`"scm/resourceState/context": [`
`3555`	`3555`	`{`
`3556`	`3556`	`"command": "github.copilot.git.resolveMergeConflicts",`
`3557`		`- "when": "scmProvider == git && scmResourceGroup == merge && mergeConflictsCount && mergeConflictsCount != 0",`
	`3557`	`+ "when": "scmProvider == git && scmResourceGroup == merge && git.activeResourceHasMergeConflicts",`
`3558`	`3558`	`"group": "z_chat@1"`
`3559`	`3559`	`},`
`3560`	`3560`	`{`
`@@ -3641,7 +3641,7 @@`
`3641`	`3641`	`{`
`3642`	`3642`	`"command": "github.copilot.git.resolveMergeConflicts",`
`3643`	`3643`	`"group": "z_chat@1",`
`3644`		`- "when": "config.git.enabled && !git.missing && !isInDiffEditor && !isMergeEditor && resource in git.mergeChanges && mergeConflictsCount && mergeConflictsCount != 0"`
	`3644`	`+ "when": "config.git.enabled && !git.missing && !isInDiffEditor && !isMergeEditor && resource in git.mergeChanges && git.activeResourceHasMergeConflicts"`
`3645`	`3645`	`}`
`3646`	`3646`	`]`
`3647`	`3647`	`},`