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

Git - Handle tag conflict during pull operation (#167278)

Browse Source 
Handle tag conflict during pull operation
This commit is contained in:
Ladislau Szomoru
2022-11-25 18:05:22 +01:00
committed by GitHub
parent a05f15f5c8
commit d4a299631a
3 changed files with 74 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

@@ -351,5 +351,6 @@ export const enum GitErrorCodes {
NoPathFound = 'NoPathFound',
UnknownPath = 'UnknownPath',
EmptyCommitMessage = 'EmptyCommitMessage',
BranchFastForwardRejected = 'BranchFastForwardRejected'
BranchFastForwardRejected = 'BranchFastForwardRejected',
TagConflict = 'TagConflict'
}