Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-04 15:25:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Git - better handle conflict during cherry-pick (#230312)

Browse Source
This commit is contained in:
Ladislau Szomoru
2024-10-02 16:39:30 +02:00
committed by GitHub
parent 9f3a7b5bc8
commit d085816005
6 changed files with 60 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/git/package.json
+10
View File
@@ -630,6 +630,12 @@
"category": "Git",
"enablement": "!operationInProgress"
},
{
"command": "git.cherryPickAbort",
"title": "%command.cherryPickAbort%",
"category": "Git",
"enablement": "!operationInProgress"
},
{
"command": "git.addRemote",
"title": "%command.addRemote%",
@@ -1203,6 +1209,10 @@
"command": "git.cherryPick",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
},
{
"command": "git.cherryPickAbort",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && gitCherryPickInProgress"
},
{
"command": "git.pull",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"