Tests: generalized createConflict in index utils#936
Merged
johnhaley81 merged 1 commit intonodegit:masternodegit/nodegit:masterfrom Mar 7, 2016
Merged
Tests: generalized createConflict in index utils#936johnhaley81 merged 1 commit intonodegit:masternodegit/nodegit:masterfrom
johnhaley81 merged 1 commit intonodegit:masternodegit/nodegit:masterfrom
Conversation
4d4970f to
078163c
Compare
Leave the repository in a conflicted state and return the index rather than the IndexEntries of the ancestor, ours, and theirs
078163c to
6608751
Compare
Contributor
Author
|
My bad this test is fixed now 👍 |
Member
|
👍 Changes look good to me, @johnhaley81 I'll let you merge if it all looks right to you |
Collaborator
|
👍 thanks again @smith-kyle |
johnhaley81
added a commit
that referenced
this pull request
Mar 7, 2016
Tests: generalized createConflict in index utils
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.
The
createConflictfunction intest/utils/index_setup.jswas specialized for a specific index test. This PR generalizes it so it can be used in future tests.