Repository navigation
fix(fork): merge upstream main into patch/voice - #44
Merged
Merged
Conversation
…ngdotgg#20384) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#20399) Co-authored-by: Cursor <cursoragent@cursor.com>
…otgg#18519) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…0406) Co-authored-by: Cursor <cursoragent@cursor.com> Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…fixes, plus Android long-press fixes (pingdotgg#20400) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: voida6 <289179128+voida6@users.noreply.github.com>
Upstream pingdotgg#20400 switched the iPad check in HomeRouteScreen to deviceType. Keep that and add the voice session's header item on top. 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
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 18:50 fork build failed because the voice patch conflicted with upstream pingdotgg#20400 in
apps/mobile/src/features/home/HomeRouteScreen.tsx. Upstream replacedPlatform.OS === "ios" && Platform.isPadwithdeviceType === "pad"on the same line where voice adds a header item for an open voice session.This merges upstream
6cecd22789intopatch/voiceand keeps both changes. Upstream'sdeviceTypecheck stays, and the voice item still gets added on top.Checked by merging upstream, release, this branch, home, bots and cache-compaction in order. All merged cleanly, and
pnpm run typecheckinapps/mobilepassed on the result.Made by Claude Opus 5.5 in Claude Code.
🤖 Generated with Claude Code