Resolve merge conflict: pin TypeScript to 5.9.3 to match main#45
Merged
naheel0 merged 1 commit intonot-found-pagefrom Feb 21, 2026
Merged
Resolve merge conflict: pin TypeScript to 5.9.3 to match main#45naheel0 merged 1 commit intonot-found-pagefrom
naheel0 merged 1 commit intonot-found-pagefrom
Conversation
Contributor
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
Copilot
AI
changed the title
[WIP] Add error page to handle unexpected issues
Resolve merge conflict: pin TypeScript to 5.9.3 to match main
Feb 21, 2026
naheel0
approved these changes
Feb 21, 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.
Merge conflict in
package.jsonbetween the PR branch ("typescript": "^5") and main ("typescript": "5.9.3"). Resolved by keeping main's pinned version for build stability.Changes
package.json: TypeScript pinned to5.9.3(current/main) over incoming^5package-lock.json: updated to reflect the pinned version💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.