Fix/merge conflict #3
Merged
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
…ation through a modal dialog. This improves the user experience by adding a safety check before performing irreversible actions.
…g component for task deletion confirmation. The change provides a more consistent user experience by using the same design system as the rest of the application. Changes: Add new DeleteTaskDialog component using Radix UIs AlertDialog Update HistoryView to manage dialog state and task deletion flow Remove VSCode native dialog from ClineProvider.ts
…teering Include the original task in the power steering content
…k_to_power_steering Revert "Include the original task in the power steering content"
Debug test flakes
Add a ClineOptions type
…ete_confirmation_854 Improvement/task delete confirmation 854
…ex-ai Added support for Claude Sonnet 3.7 via VertexAI
Add Claude 3.7
Revert "Merge pull request RooCodeInc#1125 from hannesrudolph/change_order_appl…
Changeset version bump
…ion apply_diff before write_to_file
…de-thinking Support Claude 3.7 Sonnet "Thinking" in OpenRouter
Update package.json
Thinking settings tweaks
…price Fix: Input/output prices should be parsed using parseFloat
fix: ModelID cannot be saved and refactor ModelPicker
Fix model picker
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.
fix the issue with merging to roo