Rebase with Choo changes #8
Merged
Conversation
This file contains 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
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.
Summary
This branch represents the version of hyperx with our changes on top of the latest changes from the choo fork. Ideally this will give us new features, and keep us more compatible with the mainline branch.
This is not intended to be merged in, rather, if this works as expected in Tram-One, it will replace the existing master branch for this repo.
Required Changes on Tram-One
One significant change that has been excluded in this rebase was the option to make comments default - while I believe this is a sane default, it needlessly diverts from the default fork. This will need to be changed in Tram-One to configure hyperx to have comments enabled.
Branch Comparisons
choojs/hyperx@master...Tram-One:rebase-choojs
This should represent the entirety of the new changes we have added for Tram-One support. Ideally these are minimal and sane changes that (while unlikely) allow us to consume new changes in the future easily.
We can compare this with the current set of changes that differ from choojs (at the time the two projects diverged): choojs/hyperx@master...Tram-One:master
Checklist