Repository navigation
chore(fork): merge upstream/main into collin/main - #21
Merged
Merged
Conversation
…tgg#21920) Co-authored-by: maria-rcks <[email protected]>
pingdotgg#21988) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ingdotgg#22029) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: GPT-6.1 Sol <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…adata (pingdotgg#22044) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ped names (pingdotgg#22053) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ranch (pingdotgg#22098) Co-authored-by: GPT-6.1 Sol <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…tgg#22115) Co-authored-by: GPT-6.1 Sol <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…r per command (pingdotgg#22123) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…gg#22134) Co-authored-by: maria-rcks <[email protected]>
…2141) Co-authored-by: GPT-6.1 Sol at high effort <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…otgg#22158) Co-authored-by: GPT-6.1 Sol <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…gg#22190) Co-authored-by: macodev00 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
Co-authored-by: maria-rcks <[email protected]>
…ingdotgg#22246) Co-authored-by: matthias schedel <[email protected]> Co-authored-by: Copilot <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…otgg#22308) Co-authored-by: maria-rcks <[email protected]>
… case differs from the disk (pingdotgg#22346) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: maria-rcks <[email protected]>
…gg#22392) Co-authored-by: maria-rcks <[email protected]>
…#22455) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…ttings (pingdotgg#22459) Co-authored-by: maria-rcks <[email protected]> Co-authored-by: Illia Panasenko <[email protected]>
…nux (pingdotgg#22496) Co-authored-by: Claude Opus 5.5 <[email protected]>
… t3 on PATH (pingdotgg#22639) Co-authored-by: Claude Sonnet 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…nstall (pingdotgg#22747) Co-authored-by: Cursor <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…22867) Co-authored-by: maria-rcks <[email protected]>
…g#22887) Co-authored-by: maria-rcks <[email protected]>
…istrations (pingdotgg#26511) Co-authored-by: PR Batch Tester <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
Co-authored-by: maria-rcks <[email protected]>
…6559) Co-authored-by: chief-archivist <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…tgg#26579) Co-authored-by: Dan Bolser <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…26623) Co-authored-by: maria-rcks <[email protected]>
…t" (pingdotgg#26643) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…gg#26658) Co-authored-by: PR Batch Tester <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…ngdotgg#26681) Co-authored-by: maria-rcks <[email protected]>
…der offers (pingdotgg#26682) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
pingdotgg#26758) Co-authored-by: PR Batch Tester <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]>
…." when event ingestion can't write (pingdotgg#26782) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…#26835) Co-authored-by: SAPHID <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…gdotgg#26871) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…#27020) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
… than its CLI (pingdotgg#27931) Co-authored-by: Claude Opus 5.5 <[email protected]>
…y model (pingdotgg#27891) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ngdotgg#23558) Co-authored-by: maria-rcks <[email protected]>
…otgg#24088) Co-authored-by: GPT-6.1 Sol <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…g#25865) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…viewport (pingdotgg#27795) Co-authored-by: Claude Opus 5.5 <[email protected]>
…g#27808) Co-authored-by: Claude Opus 5.5 <[email protected]>
…em as Redacted (pingdotgg#27986) Co-authored-by: Claude Opus 5.5 <[email protected]>
Conflicts: - apps/server/src/ws.ts: keep both the dictation and npmRelease services. - ChatView.browser.test.tsx: both sides added the same test; keep the fork's version, which also covers the thread being created. - updateEverything.logic.test.ts: keep the fork's other-feed test on upstream's two-argument collectServerUpdateTargets; drop the waitForNpm test upstream removed. Co-Authored-By: Claude Opus 5.5 <[email protected]>
github-actions
Bot
added
vouch:trusted
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.
sh fork/sync.shstopped on a merge conflict, socollin/mainis behindupstream/main. This mergesupstream/main(6d46336) and resolves the three conflicts, keeping upstream behavior and the fork's add-ons.apps/server/src/ws.tsdictationservice and upstream'snpmReleaseservice.apps/web/src/components/ChatView.browser.test.tsxapps/web/src/components/sidebar/updateEverything.logic.test.tscollectServerUpdateTargets. Drop thewaitForNpmtest, because upstream removed that behavior.The fork's other-feed logic in
versionSkew.tsmerged cleanly and is unchanged.Checked:
tsc --noEmitinapps/serverandapps/web;vp test runon both conflicted test files (10 passed).Not checked: the full test suite, which CI owns.
pnpm-lock.yamlchanged, so runvp iin your checkouts after merging.Claude Opus 5.5 via Claude Code in T3 Code.
🤖 Generated with Claude Code