Merge with upstream #2
Closed
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
Update docs for release.
(Should have included with last commit.)
Owner
|
Hi, this is the wrong branch. |
Author
|
That's confusing! Thanks for the clarification. I noticed the pull request was out of date but wasn't careful enough in determining the branch it was from. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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 exception-handling changes in Daikon are based on an 11-month-old version of Daikon. It has to be merged with upstream before pull request codespecs#56 can be merged. Furthermore, that pull request needs to be up to date to permit meaningful code review.
Unfortunately, the exception-handling changes are 546 commits behind master, making merging them problematic. I have spent a day trying to get the merging right, and I think this attempt is close. However, it does not pass its tests. Can you review and improve this pull request, or do the merging yourself so that the exception-handling pull request codespecs#56 is based on the current version of Daikon?
Thanks!