fix: resolve duplicate imports and corrupted merges in App.tsx and StatusBadge#237
Open
ahmedabbas52233-a11y wants to merge 1 commit into
Open
Conversation
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.
Summary
Fixes corrupted merge artifacts in
mainthat broke the dev server after recent PR merges.Changes
createBrowserRouterimport, duplicate page imports, duplicate routes, and broken object with dualpathkeysshipmentStatusutilsTesting
pnpm installcompletes successfullypnpm run devstarts without errorshttp://localhost:5173/Notes
These issues were introduced by a fast-forward merge that stacked conflicting code blocks instead of resolving them properly.