Repository navigation
Conversation
# Conflicts: # packages/alchemy/tsconfig.test.json # pnpm-lock.yaml
main's docs:check-jsdoc rewrites @section/@example to markdown headings.
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
13 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.
Unblocks PR Package on #1198.
#1198 is
CONFLICTINGwithmain(77 commits behind). GitHub cannot create a fresh merge ref, so Actions never ran for HEAD0a0b92d(#1549). Sticky pkg.ing URLs are still3f8dd70.Conflicts were only two files:
packages/alchemy/tsconfig.test.json— union of feat(prisma): add Effect-native Prisma ORM v8 support #1198 Prisma fixture excludes andmain'sshutdown-feedback-fixtureexcludepnpm-lock.yaml— regenerated withpnpm install --lockfile-onlyfrom the merged manifests#1549's@internal/extension-→@prisma/orm-extension-rewrite is still inpackages/alchemy/src/Prisma/ORM/internal.ts.Merging this into
claude/prisma-v8-rc-plan-4f746cshould make #1198 mergeable withmainand let PR Package publishhttps://pkg.ing/alchemy/<new-head>.