Repository navigation
fix(fork): merge upstream a21b43f into patch/default-machine - #240
Merged
fireboltdude1357 merged 1008 commits intoNov 12, 2026
Merged
fireboltdude1357 merged 1008 commits into
fireboltdude1357 merged 1008 commits into
Conversation
…is on the service PATH (pingdotgg#25870) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#23539) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#18588) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…t be resumed (pingdotgg#28195) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#26649) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…king (pingdotgg#23648) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#25430) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#27564) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…8442) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…ngdotgg#29183) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#27953) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…after a screenshot (pingdotgg#25978) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…g#24545) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…zes (pingdotgg#27335) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ted (pingdotgg#27595) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…restored context (pingdotgg#25911) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…5325) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… step (pingdotgg#29956) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#23356) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#28219) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#27588) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…g#34181) Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…ad in bootServiceUnitPath (pingdotgg#34518)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…rt (pingdotgg#34513) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…erent calls (pingdotgg#34528) Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
… gone (pingdotgg#34529) Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…ingdotgg#34530) Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…ntained command (pingdotgg#34531) Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…dotgg#34532) Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…equest (pingdotgg#34533) Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…le Claude threads (pingdotgg#34482)
…gdotgg#14875) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…and a 72 hour close notice (pingdotgg#34555)
…nishes (pingdotgg#34431) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts: # apps/web/src/components/settings/SettingsPanels.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 fails because
patch/default-machineconflicts with upstream a21b43f in the imports ofSettingsPanels.tsx.Upstream pingdotgg#31313 changed the
settingsSearchimport and added locale imports where the patch importsDefaultEnvironmentSettingsRow. I kept upstream's imports and added the patch's. The rest merged on its own. The patch's strings stay plain English, like the Threads panel around them, which upstream hasn't translated yet.On a scratch stack of upstream a21b43f with all 25 patches and the nine fix branches for this upstream,
pnpm install --no-frozen-lockfile,vp run typecheck, andvp test runon the test files the patches touch, plus the upstream tests next to the conflicted files, all pass (50 files, 1379 tests).Made by Claude Opus 5.5 in Claude Code.
🤖 Generated with Claude Code