-
Notifications
You must be signed in to change notification settings - Fork 29.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
doc: cherry-pick tc-minutes from master #143
Conversation
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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This conflict should be resolved.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oo, thanks @gergoerdosi!
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
eb3a24a
to
99e7c58
Compare
@bnoordhuis can you check the commits now and let me know if that's good enough? |
Yes, LGTM. |
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.