Fix corrupted lockfile from PR #19 merge#22
Merged
Merged
Conversation
…rrupted the lockfile
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
1 participant
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.
The PR #19 merge 3-way-merged
pnpm-lock.yamlbetween diverged branches (rename on dev, partial Dependabot bumps on main), producing an inconsistent lockfile (vitest: 3.2.6vscatalog:) that failspnpm install --frozen-lockfile— breaking Docker builds. Plus a Dependabot fumadocs-ui→16 bump conflicts with Next 15. This restores main to the verified-gooddevcontent: clean lockfile, builds 14/14, frozen-install passes. Safe Dependabot bumps will return via the grouped config.