This repository was archived by the owner on Feb 2, 2023. It is now read-only.
Respond to supplementary node feedback #762
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
added 13 commits
October 21, 2015 23:17
|
OK, I don't really know the correct workflow here for fixing a conflict for the author. I've tried a bunch of different things over time :). Please teach me if someone knows. In this case I was able to do it, but "publishing" the rebase (even for the directly-checked-out PR) just created a new PR. Either way I'm going to try to land that one. The conflict was from another PR that also set the =nil to =NO, which I hadn't realized this diff also did, because I reviewed it second. |
|
the other PR is #771 |
|
Haha, ironically I had to revert the diff that conflicted with this one because it broke tests, and that caused my alternate PR to be the one that won't apply cleanly! Now we can land this one :). Thanks for these refinements, I really like them! |
appleguy
added a commit
that referenced
this pull request
Oct 26, 2015
Respond to supplementary node feedback
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Went through @appleguy's post-merge review on #694 and cleaned up various aspects of the supplementary node implementation.