Resolve merge conflict: pin typescript to 5.9.3#44
Merged
naheel0 merged 2 commits intonot-found-pagefrom Feb 21, 2026
Merged
Conversation
Contributor
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
Co-authored-by: naheel0 <191262736+naheel0@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Add error page
Resolve merge conflict: pin typescript to 5.9.3
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.
PR #42 (
not-found-page→main) was blocked by a conflict inpackage.json— the feature branch had"typescript": "^5"whilemainhad it pinned to"5.9.3".Change
package.json: Updated"typescript": "^5"→"5.9.3"to matchmain's pinned version. Thepackage-lock.jsonwas already resolving to5.9.3, making this the unambiguous correct resolution.✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.