Recursively merge all the things #6
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
|
Dang. I see you just merged a refactor :) |
|
:'( Yeah. Sorry, I didn't know this was incoming! |
|
This might still be valuable, though: do those two tests fail without the rest of the patch? |
|
Those tests are required to verify https://github.com/steveklabnik/json-merge_patch/blob/master/lib/json/merge_patch.rb#L97 I just noticed that I could delete that line and nothing failed |
|
Right. Awesome. I had a feeling that I was missing some edge cases, but wasn't 100% sure. |
|
Let me rebase, master changed. |
There's no need to return nil for the special case obj.nil? since returning the object itself will do.
|
There you are sir |
steveklabnik
added a commit
that referenced
this pull request
May 19, 2013
Recursively merge all the things
|
Thank you very much! |
|
4.0 GPA 💯 🎉 |
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 commits for details