Add GIT_EMERGECONFLICT and GIT_EDIRECTORY error mapping #1208
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| /// <summary> | ||
| /// A merge conflict exists and cannot continue | ||
| /// </summary> | ||
| EmergencyConflict = -24, |
There was a problem hiding this comment.
Is EmergencyConflict a typo? 🚑
There was a problem hiding this comment.
typo mixed with an oversight:) thanks, fixed.
267c7b0 to
14ccd34
Compare
nulltoken
added a commit
that referenced
this pull request
Oct 23, 2015
Add GIT_EMERGECONFLICT and GIT_EDIRECTORY error mapping
|
@odedw Another one in. Congrats and so many thanks ✨ |
|
@nulltoken Thanks! Glad I can help! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added two missing error codes - issue #1203.