doc: cherry-pick tc-minutes from master #143
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
|
I imagine a cherry-pick should be fine -- usually things don't come into the branches from master, so there may not be a lot of prior art. |
| * Update on "release buckets" | ||
| * doesn't make sense while we're private, we'll wait until it is public again | ||
| * `node-forward/node` going public | ||
| <<<<<<< HEAD |
rvagg
force-pushed
the
tc-minutes-prev
branch
from
037cc66
to
eb3a24a
Compare
|
LGTM. I would squash eb3a24a and maybe mention the original commit shasums in the cherry-picked in the commit log ("This is commit 1234567 cherry-picked from the master branch.") |
Fixes node-forward/node#4 PR-URL: node-forward/node#9 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> @rvagg: cherry-picked 3cb5f3d from master to v0.12
PR-URL: node-forward/node#41 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> @rvagg: cherry-picked 2c7847b and e7dec60 from master to v0.12
rvagg
force-pushed
the
tc-minutes-prev
branch
from
eb3a24a
to
99e7c58
Compare
|
@bnoordhuis can you check the commits now and let me know if that's good enough? |
|
Yes, LGTM. |
This was referenced Jan 31, 2020
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.
Can someone tell me if this is the right way to do this? I just did a cherry-pick for the 3 commits that added the minutes to master and pulled them in to v0.12. I want to add two more files to this directory and v0.12 is probably the place to do it.