Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 03:54:24 +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

3
extensions/git/src/api/git.d.ts vendored
View File

@@ -410,5 +410,6 @@ export const enum GitErrorCodes {
BranchFastForwardRejected = 'BranchFastForwardRejected',
BranchNotYetBorn = 'BranchNotYetBorn',
TagConflict = 'TagConflict',
CherryPickEmpty = 'CherryPickEmpty'
CherryPickEmpty = 'CherryPickEmpty',
CherryPickConflict = 'CherryPickConflict'
}