Repository navigation
chore(sync): merge pingdotgg/t3code main - #375
Merged
Merged
Conversation
…hout effects (pingdotgg#25523) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#25530) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…6-1709 # Conflicts: # apps/web/src/components/pullRequest/PullRequestsPage.tsx
Yarden-zamir
enabled auto-merge
October 26, 2026 17:41
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.
Cause
Fork Sync run 40365708100 stopped on a merge conflict in
PullRequestsPage.tsx. The batch has 3 upstream commits:registerCommands.Conflicts and resolution
PullRequestsPage.tsximports: upstream addsregisterCommands. The fork does not useshortcutLabelForCommandon this page, so that import stays out.Fork fixes
ThreadComposer.tsx: upstream's new compact editor leavesuseLayoutEffectimported but unused, and fork lint fails on it. The import is removed.Upstream merge
Merges pingdotgg/t3code main at 210b2e7 "fix(mobile): keep expanding composer text above its toolbar (pingdotgg#25396)".
Adopted upstream pull requests
All 7 entries are unchanged at their listed heads. No new merges.
Upstream changes in fork areas
2 files changed on both sides:
ComposerSurface, which upstream did not change.Checks
checks.py: typecheck, migration check, adopted pull request check and format pass. Lint passes after the fix above. Knip passes when run alone.fork_tests.py: 180 fork test files pass locally (119 root and 61 web). Theapps/serverfork test files are left to Fork CI.Fork repair skill changes
None.