fix: clean up App.test.tsx conflict markers from Sprint 46 Slice 2 squash#61
Merged
Conversation
…nt 46 Slice 2 squash merge The Sprint 46 Slice 2 (achievements gallery) squash-merge missed conflict markers in App.test.tsx. This hotfix keeps both new test cases (Sprint 46 Slice 1's emitter-mount test and Slice 2's achievements route test), and updates the route assertion to match the actual additive routeTree.addChildren pattern that resolved against Sprint 45's prior addChildren calls. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
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.
Hotfix for typecheck failure introduced when Sprint 46 Slice 2 (PR #51) was rebased+squash-merged with leftover conflict markers in apps/web/src/app/App.test.tsx (lines 117/124/129). Keeps both Sprint 46 Slice 1 emitter-mount test and Slice 2 achievements route test, and updates the route assertion to match the actual additive routeTree.addChildren pattern.