fix(interface): remove conflict markers committed to Settings.tsx in #193 merge - #620
Merged
Merged
Conversation
…193 merge The Settings.tsx conflict in the #193 merge was staged unresolved, which broke the interface typecheck on main. Resolves to the restructured Settings from main and keeps #193's contribution: the model field pre-populates from the default agent's active routing when editing a configured provider.
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.
My conflict resolution for #193 staged Settings.tsx with unresolved markers — git listed the conflict, I read the output through
tail -3and only saw providers.rs, and the Rust-only required checks stayed green while the interface typecheck broke on main.This resolves the file properly: main's restructured Settings wins, and #193's contribution survives — the model field pre-populates from the default agent's active routing when editing a configured provider (the supporting queries came through the merge intact; only the
onEditwiring was lost in the marker soup).Validated with
bunx tsc --noEmit(the exact check that's failing on main). Merging with admin bypass immediately since main's interface build is red.