Resolve merge conflicts with dev on Snyk upgrade branch (no remaining diff) - #183
Open
angeloreale wants to merge 4 commits into
Open
Resolve merge conflicts with dev on Snyk upgrade branch (no remaining diff)#183angeloreale wants to merge 4 commits into
angeloreale wants to merge 4 commits into
Conversation
Snyk has created this PR to upgrade @radix-ui/react-label from 2.1.7 to 2.1.8. See this package in npm: @radix-ui/react-label See this project in Snyk: https://app.snyk.io/org/angeloreale/project/7c2db482-67fd-466e-a64b-82dcb911980e?utm_source=github&utm_medium=referral&page=upgrade-pr
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
Contributor
Author
|
@copilot please resolve the merge conflicts in this pull request |
…015fd0a428d95c3913b8a23 # Conflicts: # package-lock.json # package.json
Contributor
Done — I merged the latest |
Copilot
AI
changed the title
[Snyk] Upgrade @radix-ui/react-label from 2.1.7 to 2.1.8
Resolve merge conflicts with dev on Snyk upgrade branch
May 30, 2026
angeloreale
commented
May 30, 2026
| @@ -1,6 +1,5 @@ | |||
| /// <reference types="next" /> | |||
| /// <reference types="next/image-types/global" /> | |||
| /// <reference path="./.next/types/routes.d.ts" /> | |||
Contributor
Author
There was a problem hiding this comment.
that's embarrassing, but funnily wit
Contributor
There was a problem hiding this comment.
Fixed — I reverted the unintended next-env.d.ts change in commit eae06f7, so this PR no longer includes that file diff.
Copilot
AI
changed the title
Resolve merge conflicts with dev on Snyk upgrade branch
Resolve merge conflicts with dev on Snyk upgrade branch (no remaining diff)
May 30, 2026
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
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.
PLEASE REVIEW YOUR OWN PR BEFORE OPENING/UN-DRAFTING IT
Resolve merge conflicts with dev on Snyk upgrade branch (no remaining diff)
This PR was updated to resolve merge conflicts against
origin/dev.After review feedback, the unintended
next-env.d.tschange was reverted.Current state:
origin/dev.Screenshots/Videocasts/Preview Links
N/A
Have you?
If so, THANKS! You can pop a beer/soda.
Please open your PR and ping your colleagues to review it on #web-devs channel.
Also, make sure to remind them on a daily basis during stand-up.