Skip to content
This repository has been archived by the owner on Apr 16, 2020. It is now read-only.

Modules rebase #13

Closed
wants to merge 7 commits into from
Closed

Modules rebase #13

wants to merge 7 commits into from

Conversation

MylesBorins
Copy link
Contributor

Tests work on this branch locally. We are going to have to force push against master.

The conflicts were not a huge deal, mostly related to the change in the way options or retrieved

guybedford and others added 6 commits November 8, 2018 20:18
Refs: nodejs/modules#180

PR-URL: #6
Reviewed-By: Myles Borins <MylesBorins@google.com>
Reviewed-By: John-David Dalton <john.david.dalton@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Refs: nodejs/modules#180

PR-URL: #6
Reviewed-By: Guy Bedford <guybedford@gmail.com>
Reviewed-By: John-David Dalton <john.david.dalton@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Refs: nodejs/modules#180

PR-URL: #6
Reviewed-By: Guy Bedford <guybedford@gmail.com>
Reviewed-By: John-David Dalton <john.david.dalton@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Refs: nodejs/modules#180

PR-URL: #6
Reviewed-By: Guy Bedford <guybedford@gmail.com>
Reviewed-By: John-David Dalton <john.david.dalton@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
PR-URL: #6
Reviewed-By: Guy Bedford <guybedford@gmail.com>
Reviewed-By: John-David Dalton <john.david.dalton@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
PR-URL: #6
Reviewed-By: Guy Bedford <guybedford@gmail.com>
Reviewed-By: Myles Borins <mylesborins@google.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
@MylesBorins
Copy link
Contributor Author

@MylesBorins MylesBorins mentioned this pull request Nov 8, 2018
2 tasks
@guybedford
Copy link
Contributor

Nice work, could you bring node master through as a branch here so we can see the PR comparison of just our commits?

@guybedford
Copy link
Contributor

(unfortunately because this is not a public fork that can't be done from GitHub compare otherwise)

PR-URL: #6
Reviewed-By: Guy Bedford <guybedford@gmail.com>
Reviewed-By: Myles Borins <mylesborins@google.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
@MylesBorins MylesBorins changed the base branch from master to modules-lkgr November 8, 2018 20:38
@MylesBorins MylesBorins changed the base branch from modules-lkgr to master November 8, 2018 20:38
@MylesBorins
Copy link
Contributor Author

@guybedford I've gone ahead and reset master against upstream and pushed the last known good version of the master branch from this repo to modules-lkgr. I've also gone ahead and made that the default branch of the repo

This PR is now showing only the changes ontop of the current upstream master

Copy link
Contributor

@guybedford guybedford left a comment

Choose a reason for hiding this comment

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

Perfect, looks good - not sure if you want to approve these?

@MylesBorins
Copy link
Contributor Author

If CI is green I'm going to go ahead and force push and land the other PRs

@MylesBorins
Copy link
Contributor Author

updated

@MylesBorins MylesBorins closed this Nov 9, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants