Index.conflictAdd should have nullable entries#997
Merged
Conversation
Collaborator
|
@implausible could you write a more descriptive summary of this commit please? |
when you run into a conflict, sometimes one of the entries just plain old doesn't exist. An example being you create a file in 2 branches and try to merge them. They have no ancestor_entry because they were both created in their respective branches. Therefore, ancestor_entry should be null. The same can apply to our_entry and their_entry
implausible
force-pushed
the
make-conflict-add-nullable
branch
from
ad72d9e to
d6f0827
Compare
implausible
added a commit
that referenced
this pull request
Apr 18, 2016
Index.conflictAdd should have nullable entries
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
2 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 you run into a conflict, sometimes one of the entries just plain old doesn't exist. An example being you create a file in 2 branches and try to merge them. They have no ancestor_entry because they were both created in their respective branches. Therefore, ancestor_entry should be null. The same can apply to our_entry and their_entry