Explicitly handle GIT_DELTA_CONFLICTED in git_diff_merge() #3228
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
|
Can someone restart the Travis build? Looking at the logs, seems like a CI problem. |
|
What was happening before? Is there some test which covers this situation? |
|
Before it would create a hybrid |
This fixes a bug where if a file was in conflicted state in either diff, it would not always remain in conflicted state in the merged diff.
|
Added unit test and rebased. The issue was actually bigger than I originally thought as a conflicted file in the index, but not existing in the workdir, could be reported as |
carlosmn
added a commit
that referenced
this pull request
Jun 23, 2015
Explicitly handle GIT_DELTA_CONFLICTED in git_diff_merge()
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.
(see commit message)