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

fix: yarn.lock conflicts on setup #1367

Merged
merged 1 commit into from
Mar 24, 2020
Merged

fix: yarn.lock conflicts on setup #1367

merged 1 commit into from
Mar 24, 2020

Conversation

snitin315
Copy link
Member

@snitin315 snitin315 commented Mar 24, 2020

What kind of change does this PR introduce?

yarn.lock file is not up-to-date.

To reproduce the error -

  • reset the branch with upstream/next
  • run yarn
  • see differences

Did you add tests for your changes?

NA

If relevant, did you update the documentation?

NA

Summary
NA

Does this PR introduce a breaking change?

NO
Other information

@snitin315 snitin315 requested a review from a team as a code owner March 24, 2020 11:39
@webpack-bot
Copy link

Thank you for your pull request! The most important CI builds succeeded, we’ll review the pull request soon.

@snitin315
Copy link
Member Author

Looks like the culprit is #1317

Copy link
Member

@anshumanv anshumanv left a comment

Choose a reason for hiding this comment

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

Don't worry about it, handled in #1339

@webpack-bot
Copy link

@snitin315 Thanks for your update.

I labeled the Pull Request so reviewers will review it again.

@anshumanv Please review the new changes.

@snitin315
Copy link
Member Author

@anshumanv I think still there are some differences after merge #1339

@snitin315
Copy link
Member Author

@anshumanv anshumanv merged commit 57224a0 into webpack:next Mar 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants