move conflicts to reuc when removing index entries#326
Closed
ethomson wants to merge 1 commit into
Closed
Conversation
|
My tests have a zipped repository that has conflicts. Since it was made by msysgit, it's a good reference to a repository started and generated outside of libgit2sharp. I can share code + test + repo unzipping on Monday when I get back to my desk |
Member
👍 Yes, please. |
Member
Hmmm. It appears we already have a test repo with conflicts. Would |
Member
Author
|
There is no codepath by which this code ever possibly be called. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
When removing files from the index, remove the associated conflicts and move them to the REUC.
I'm stumped as to how to add a test for this, though. We can't, it seems, add conflicts to the index directory. We could expose some methods that allow for that.
Or we could add some test repository that has conflicts in it...
Preferences?
/cc @yishaigalatzer