Repository navigation
fix(fork): merge upstream 5211acf into patch/bots - #132
Merged
Merged
Conversation
Co-authored-by: codex <codex@users.noreply.github.com>
…#26375) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ng changed (pingdotgg#26362) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#26387) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…Chat (pingdotgg#26369) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…om (pingdotgg#26392) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#26391) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#26395) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…rom custom snooze (pingdotgg#26427) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ywhere (pingdotgg#26432) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…o collapsed state (pingdotgg#25869) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… new links in settings (pingdotgg#26434) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…nse templates (pingdotgg#26440) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…call (pingdotgg#26442) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ws only dead models (pingdotgg#26448) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… cut off (pingdotgg#26449) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…installs (pingdotgg#26458) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#26463) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…-upstream-5211acf # Conflicts: # apps/web/src/components/Sidebar.tsx
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.
The fork's nightly build would fail at upstream's current head, 5211acf, because this patch conflicts with it. This branch merges 5211acf.
apps/web/src/components/Sidebar.tsx: upstream's feat(web): boring sidebar can show folder threads on two lines pingdotgg/t3code#26463 adds a two-line folder row variant. I took upstream's row variant choice and kept this patch's Bots shelf in the card rows.Verification:
vp run typecheck: 36 of 36 tasks pass.vp test runon the 13 test files this patch adds or changes: 337 passed..github/fork-patches.txtmerge with no conflicts, using the bots and timeline-index-reuse fix branches. On the result, the build's repo-widevp run typecheckpasses all 36 tasks, and the 23 test files the patches add or change pass (673 tests).Made by Claude Opus 5.5 in Claude Code.
🤖 Generated with Claude Code