Introduce advance conflict data (REUC, renames) #748
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
LibGit2Sharp/Core/NativeMethods.cs
Outdated
Member
There was a problem hiding this comment.
Should this be uint like git_index_reuc_entrycount below?
added 3 commits
June 14, 2014 19:16
We're not clearing the conflicts, we're resolving them. The difference is that removing from the index means that the items get moved to the REUC. "Clearing" or "removing" (in libgit2 terminology, anyway) means that they are removed without being resolved (or going into the REUC).
Member
|
@ethomson Perfect PR! 💯 |
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.
This introduces the ability for clients to query advanced conflict data: namely, the state of renamification that occurred leading to conflicts, and the resolved conflicts.
This includes the test repository from libgit2 that contains the types of rename conflicts that one might see (rename 1->2, rename 2->1, etc, etc).