Skip to content
This repository has been archived by the owner on Jul 6, 2018. It is now read-only.

Preparing for the PR against master #173

Closed
jasnell opened this issue Jul 10, 2017 · 7 comments
Closed

Preparing for the PR against master #173

jasnell opened this issue Jul 10, 2017 · 7 comments

Comments

@jasnell
Copy link
Member

jasnell commented Jul 10, 2017

This week I will be preparing the PR to open against nodejs/node master. Once that lands, all future work will be done in the nodejs/node repository following the normal Node.js core processes. In preparation for that, I will be squashing the commit history down to clean up the commit log. The PR is already going to be extremely difficult to review given the amount of code. The commit history in nodejs/http2 master will not be changed so we will still have a record of the individual contributions here.

Also, I'm currently working on rebasing nodejs/http2 master to nodejs/node master and will be force pushing soon. The current set of open PRs will need to be rebased if they have not landed before then. Let's try to get them landed soon!

FYI: I will be on a plane Tuesday afternoon and most of the day Thursday but will be trying to work on the flight.

@jasnell
Copy link
Member Author

jasnell commented Jul 10, 2017

All.. I am preparing to force push to master with the nodejs/node master rebase. Just FYI...

@sebdeckers
Copy link
Contributor

@jasnell What's the process now that the PR is open? E.g. #170 has an update

Not sure how long the PR review might take. Could have a cooling-off period. Would prefer to continue collaborating in the mean time.

@jasnell
Copy link
Member Author

jasnell commented Jul 15, 2017

I'll push the pr branch to nodejs/http2. We can open new prs against that :)

@sebdeckers
Copy link
Contributor

Ah, that's great. I now see an initial-pr branch in this repo.

@sebdeckers
Copy link
Contributor

Might also have worked if the big PR was from nodejs/http2#pr into nodejs/node#master.

@jasnell
Copy link
Member Author

jasnell commented Jul 17, 2017

I had tried that but it's a bit difficult given that nodejs/http2 is not a true fork of the nodejs/node repo. As it is, any changes to the initial-pr branch in nodejs/http2 can be easily pushed to the initial-pr branch in jasnell/http2-1 so things should just work

@jasnell
Copy link
Member Author

jasnell commented Jul 17, 2017

Going to close this issue now that the PR is opened!

@jasnell jasnell closed this as completed Jul 17, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants