Skip to content
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

Merged
merged 2 commits into from
Dec 11, 2014
Merged

Conversation

rvagg
Copy link
Member

@rvagg rvagg commented Dec 11, 2014

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.

@chrisdickinson
Copy link
Contributor

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

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.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oo, thanks @gergoerdosi!

@bnoordhuis
Copy link
Member

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
Copy link
Member Author

rvagg commented Dec 11, 2014

@bnoordhuis can you check the commits now and let me know if that's good enough?

@bnoordhuis
Copy link
Member

Yes, LGTM.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants