Fix pnpm-lock.yaml after bad dependabot merge#9446
Merged
Conversation
absidue
requested review from
a user,
MarmadileManteater,
PikachuEXE,
Svallinn,
efb4f5ff-1298-471a-8973-3d47447115dc and
kommunarr
July 17, 2026 18:34
FreeTubeBot
enabled auto-merge (squash)
July 17, 2026 18:34
github-actions
Bot
added
PR: dependencies
efb4f5ff-1298-471a-8973-3d47447115dc
approved these changes
Jul 17, 2026
PikachuEXE
approved these changes
Jul 17, 2026
ghost
approved these changes
Jul 17, 2026
github-actions
Bot
removed
the
PR: waiting for review
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
4 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.
Pull Request Type
Description
GitHub didn't detect merge conflicts in #9440, so dependabot didn't rebase it and I was able to merge it, that resulted in GitHub trying to resolve the conflicts automatically during the merge, breaking the lock file.
This pull request manually fixes the issue, to fix the builds on the development branch and unblock the currently open dependabot pull requests.
Testing
Tested locally with
pnpm install --frozen-lockfilewhich ran succesfully.