Skip to content

fixes #2033 namespace import reexport case - #2034

Merged
lukastaegert merged 1 commit into
masterfrom
namespace-import-duplicates
Mar 7, 2018
Merged

fixes #2033 namespace import reexport case#2034
lukastaegert merged 1 commit into
masterfrom
namespace-import-duplicates

Conversation

@guybedford

Copy link
Copy Markdown
Contributor

This fixes #2033.

Again, rebased to prettier and Rollup update PRs to ensure passing tests and noise-free diff!

@lukastaegert lukastaegert left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

👍Looks good!

@lukastaegert lukastaegert added this to the 0.56.5 milestone Mar 6, 2018
@lukastaegert

lukastaegert commented Mar 6, 2018

Copy link
Copy Markdown
Member

One note though on making PRs vs branches other than master: If this is not really necessary I'd rather have the noise in the PR but have it raised against master. Otherwise it is much harder to do the merges right in a way that Github's merge detection works properly. So for this PR, I will

  • Merge apply-prettier into a release branch first
  • Change the base branch of this PR to the new release branch
  • Merge this PR into the release branch. Then this branch will be marked as merged though it is technically not merged into master. And if there are lots of other things in the release, it may be like that for quite some time
  • Then merge the release branch into master

While if it is raised against master, I can

  • Merge PRs into my release branch in any order I like
  • They will only be marked as merged once this release branch is merged into master

@guybedford

Copy link
Copy Markdown
Contributor Author

@lukastaegert this was a one off to deal with (a) failing tests and (b) commit noise from an added commit hook that was modifying all PRs to make them harder to review. Correcting these issues created by others took me an hour. The least you can do is deal with a slightly different rebase process.

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.

Importing external package as namespace creates duplicate imports

2 participants