Introduce CheckoutConflictException #1059
Merged
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
Rename MergeConflictException to CheckoutConflictException, as merge conflicts are not a failure, only checkout conflicts are a failure.
|
Any chance we could use some kind of deprecation strategy with this? Proposal: Make |
|
That's exactly what I did. 😝 |
|
@ethomson 😖 I think I scrolled too fast over Sorry for the noise... |
nulltoken
added a commit
that referenced
this pull request
May 29, 2015
Introduce CheckoutConflictException
|
Published as NuGet pre-release package |
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.
A merge conflict is a perfectly reasonable thing to occur during a merge, and does not produce an exception. libgit2 only produces an error of
GIT_ECONFLICTwhen there's a checkout conflict. Rename our exception type to match.