Repository navigation
chore: sync upstream pingdotgg/t3code (conflicts) - #160
Merged
Merged
Conversation
…dotgg#20522) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ingdotgg#20539) Co-authored-by: Claude Opus 5.5 <[email protected]>
…otgg#20640) Co-authored-by: Claude Opus 5.5 <[email protected]>
…identical (pingdotgg#20730) Co-authored-by: Claude Opus 5.5 <[email protected]>
…pushes (pingdotgg#20731) Co-authored-by: Claude Opus 5.5 <[email protected]>
…oization (pingdotgg#20723) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ingdotgg#20722) Co-authored-by: Claude Opus 5.5 <[email protected]>
…t manual memoization (pingdotgg#20719) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ingdotgg#20718) Co-authored-by: Claude Opus 5.5 <[email protected]>
…tion (pingdotgg#20716) Co-authored-by: Claude Opus 5.5 <[email protected]>
pingdotgg#20714) Co-authored-by: Claude Opus 5.5 <[email protected]>
…on (pingdotgg#20713) Co-authored-by: Claude Opus 5.5 <[email protected]>
…oization (pingdotgg#20712) Co-authored-by: Claude Opus 5.5 <[email protected]>
…dotgg#20711) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ation (pingdotgg#20710) Co-authored-by: Claude Opus 5.5 <[email protected]>
pingdotgg#20708) Co-authored-by: Claude Opus 5.5 <[email protected]>
…pingdotgg#20707) Co-authored-by: Claude Opus 5.5 <[email protected]>
…tion (pingdotgg#20705) Co-authored-by: Claude Opus 5.5 <[email protected]>
pingdotgg#20704) Co-authored-by: Claude Opus 5.5 <[email protected]>
…otgg#20703) Co-authored-by: Claude Opus 5.5 <[email protected]>
Co-authored-by: Claude Opus 5.5 <[email protected]>
…ation (pingdotgg#20701) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ingdotgg#20699) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ngdotgg#20698) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ion (pingdotgg#20697) Co-authored-by: Claude Opus 5.5 <[email protected]>
…g#20696) Co-authored-by: Claude Opus 5.5 <[email protected]>
…on (pingdotgg#20695) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ingdotgg#20449) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ion parsing before names (pingdotgg#20440) Co-authored-by: Claude Opus 5.5 <[email protected]>
Co-authored-by: Claude Opus 5.5 <[email protected]>
Co-authored-by: Pixel Perfect <[email protected]> Co-authored-by: Claude Fable 5.1 <[email protected]>
…e keyboard (pingdotgg#20803) Co-authored-by: Pixel Perfect <[email protected]> Co-authored-by: Claude Fable 5.1 <[email protected]>
…ingdotgg#20792) Co-authored-by: Claude Opus 5.5 <[email protected]>
…o" (pingdotgg#20811) Co-authored-by: Claude Opus 5.5 <[email protected]>
pingdotgg#20793) Co-authored-by: Claude Opus 5.5 <[email protected]>
…mo" (pingdotgg#20794) Co-authored-by: Claude Opus 5.5 <[email protected]>
…memo" (pingdotgg#20820) Co-authored-by: Claude Opus 5.5 <[email protected]>
…o" (pingdotgg#20799) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ingdotgg#20815) Co-authored-by: Claude Opus 5.5 <[email protected]>
…emo" (pingdotgg#20816) Co-authored-by: Claude Opus 5.5 <[email protected]>
…otgg#20818) Co-authored-by: Claude Opus 5.5 <[email protected]>
…o" (pingdotgg#20822) Co-authored-by: Claude Opus 5.5 <[email protected]>
…pingdotgg#20798) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ngdotgg#20834) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ingdotgg#20807) Co-authored-by: Claude Opus 5.5 <[email protected]>
…use memo" (pingdotgg#20824) Co-authored-by: Claude Opus 5.5 <[email protected]>
…without "use memo" (pingdotgg#20827) Co-authored-by: Claude Opus 5.5 <[email protected]>
Co-authored-by: Claude Opus 5.5 <[email protected]>
Owner
Author
|
@copilot resolve the merge conflicts on this pull request by merging Rules:
Conflicting files:
|
Co-authored-by: LadyBluenotes <[email protected]>
Merged |
Upstream rewrote ChatComposer without "use memo", so the resolution took its version whole and lost the three saved-prompts seams docs/fork.md lists: the menu items run through useSavedPromptMenuItems, the saved-prompt branch when an item is picked, and the use count after a send. They are back on the rewritten file, with the seam row reworded for the builder that replaced the useMemo. The Copilot default slot is reserved again in AddProviderInstanceDialog, which now has a seam row. Co-Authored-By: Claude Fable 5.1 <[email protected]>
Co-Authored-By: Claude Fable 5.1 <[email protected]>
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.
Nightly sync of
pingdotgg/t3codeat9ba614301c10d77cb5e51189a537029688c6baf0did not merge automatically.Conflicting files:
apps/web/src/components/CommandPalette.tsxapps/web/src/components/chat/ChatComposer.tsxapps/web/src/components/settings/AddProviderInstanceDialog.tsxapps/web/src/components/sidebar/SidebarChrome.tsxpackages/client-runtime/package.jsonResolve the conflicts on this pull request, or merge
sync/upstreamintomainlocally and push. The next nightly run closes this oncemaincontains upstream.