Repository navigation
fix(fork): merge upstream d356059 into patch/voice - #61
Merged
Merged
Conversation
…ter (pingdotgg#19964) (pingdotgg#22395) Co-authored-by: Julius Marminge <julius@marminge.se>
…tgg#22253) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t fields (pingdotgg#22203) Co-authored-by: Claude Code <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#22187) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…22390) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#22427) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…vent in act (pingdotgg#22424) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ap (pingdotgg#22408) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…; fixture README (pingdotgg#22453) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#20812) Co-authored-by: Pixel Perfect <me@pixp.cc> Co-authored-by: Theo Browne <me@t3.gg> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: Utkarsh Patil <73941998+UtkarshUsername@users.noreply.github.com>
…g#22194) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…erShell (pingdotgg#22494) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…sts over REST (pingdotgg#22495) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#22521) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ction (pingdotgg#22526) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tes (pingdotgg#22524) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#22533) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#22523) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Upstream pingdotgg#21404 fixed new threads in non-git folders on mobile, which fork #10 also fixed in this patch. Take upstream's version of new-task-flow-provider.tsx and NewTaskDraftScreen.tsx. Keeping both left projectGitStatus declared twice. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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
10 participants
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 fails because this patch conflicts with upstream commit d356059.
apps/mobile/src/features/threads/NewTaskDraftScreen.tsxandnew-task-flow-provider.tsx: this patch carries fork fix(mobile): Send works for new threads in folders that aren't git repos #10, which made Send work for new threads in folders that aren't git repositories. Upstream fixed the same bug in fix(mobile): use current checkout for non-git projects pingdotgg/t3code#21404: it reads the project's git status and forces local mode for non-repositories throughresolveNewTaskWorkspaceSelection. Git merged the fork'sprojectGitStatusblock next to upstream's, so the provider declared it twice. I took upstream's version of both files. Neither file differs from upstream now.Verification:
pnpm install --no-frozen-lockfile: done.pnpm run typecheckinapps/mobile: 0 errors.vp test runinapps/mobilefor this patch's tests (voiceSessionController,voiceSessionState,voiceStartupAudio,mobile-preferences,SubscriptionUsage.android,subscriptionUsageSnapshot) and upstream'snew-task-context-presentation.test.ts: 93 passed.patch/release, this branch,patch/home,patch/bots,patch/cache-expiry-compactionandpatch/mobile-launch-crashmerge with no conflicts.Made by Claude Opus 5.5 in Claude Code.
🤖 Generated with Claude Code