Revert "Frq feature " - #377
Merged
Merged
Conversation
saa938
added a commit
that referenced
this pull request
Aug 21, 2026
main carries commit ff5fcdc, the blanket revert of PR #376 ("Frq feature"). The frq branch was then rebuilt from the pre-revert merge base c528939 and the bugs that caused the revert were fixed in PRs #379-#382. Because the rebuild produced new commit SHAs, git cannot relate the revert to the work that supersedes it, so every FRQ file collides: 18 conflicts, plus 10 files that main deleted and frq never touched, which git resolves silently as deletions. main has no independent changes since the merge base. Its only commits are the #376 merge, the revert, and the #377 merge, so every conflicting hunk on main's side is reverted pre-FRQ code that the fix PRs replace. The merge is therefore resolved to the frq tree in full, which also restores the 10 files that would otherwise have been dropped: firebase.json, firestore.indexes.json, frqRefs.ts, responseEditor.tsx, FRQDropdown.tsx, FRQFooter.tsx, unitFrqs.tsx, and feedback/header.tsx, feedback/leftSide.tsx, feedback/types.ts. Verified: next build succeeds and emits all five FRQ routes (authoring, taking, /frq-grading, /frq-grading/[id], /frq-feedback/[id]).
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.
Reverts #376