fix: fork Node generators#4214
Merged
timsuchanek merged 4 commits intomasterfrom Nov 10, 2020
Merged
Conversation
Jolg42
reviewed
Nov 10, 2020
Comment on lines
-47
to
-57
| '@prisma/bar': 0.0.1 | ||
| '@prisma/engines': 2.11.0-10.58369335532e47bdcec77a2f1e7c1fb83a463918 | ||
| '@prisma/bar': 0.0.0 | ||
| '@prisma/engines': 2.11.2-9-a624a6628b9e5e453bb8f8cb0460e233a3a97e62 | ||
| devDependencies: | ||
| '@prisma/client': 'link:../client' | ||
| '@prisma/debug': 'link:../debug' | ||
| '@prisma/generator-helper': 'link:../generator-helper' | ||
| '@prisma/get-platform': 'link:../get-platform' | ||
| '@prisma/migrate': 'link:../migrate' | ||
| '@prisma/sdk': 'link:../sdk' | ||
| '@prisma/studio': 0.310.0 | ||
| '@prisma/studio-server': 0.310.0 |
Contributor
Author
There was a problem hiding this comment.
Yes, I just took one of the lock files when resolving the conflict.
I think it'll be overwritten anyway.
Jolg42
added a commit
that referenced
this pull request
Nov 10, 2020
* master: fix: fork Node generators (#4214) chore(deps): update studio to v0.311.0 fix: bump engines (#4207) ci: Test Buildkite config 10 & 14 ci: revert buildkite test pipeline [skip ci] ci: test Buildkite config ci: test Buildkite config chore(deps): update dependency @types/node to v12.19.4 chore(deps): update devdependencies (non-major) feat(client): validate constructor (#4176)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Because for whatever reason GitHub did not include the "Merge branch 'master'" commit in #4175