Skip to content

chore: sync upstream pingdotgg/t3code (conflicts) - #37

Merged
LadyBluenotes merged 154 commits into
mainfrom
sync/upstream
Oct 12, 2026
Merged

LadyBluenotes merged 154 commits into
mainfrom
sync/upstream

Conversation

@LadyBluenotes

Copy link
Copy Markdown
Owner

Nightly sync of pingdotgg/t3code at c0c495e4dc12bbb0bb44387657a5682661cdd05c did not merge automatically.

Conflicting files:

  • apps/mobile/src/features/usage/usageProviders.ts
  • apps/server/src/provider/builtInDrivers.ts
  • apps/server/src/serverSettings.ts
  • apps/web/src/components/usage/UsageProviderChart.test.ts
  • apps/web/src/components/usage/usageProviders.ts
  • docs/user/usage.md
  • package.json
  • packages/contracts/src/usage.ts

Resolve the conflicts on this pull request, or merge sync/upstream into main locally and push. The next nightly run closes this once main contains upstream.

juliusmarminge and others added 30 commits October 10, 2026 00:18
…editor is a Windows command shim (pingdotgg#17749)

Co-authored-by: Claude Opus 5.5 <[email protected]>
PixPMusic and others added 20 commits October 11, 2026 11:27
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: maria-rcks <[email protected]>
…dotgg#16271)

Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
Co-authored-by: Julius Marminge <[email protected]>

Copy link
Copy Markdown
Owner Author

@copilot resolve the merge conflicts on this pull request by merging main into sync/upstream and pushing the result to this branch.

Rules:

  • Keep every line listed in docs/fork.md under "Upstream seams"; those lines are this fork's.
  • Everywhere else take upstream's side.
  • Regenerate apps/web/src/routeTree.gen.ts by running the web build instead of editing it.
  • Typecheck apps/server, packages/contracts and apps/web before you finish.

Conflicting files:

  • apps/mobile/src/features/usage/usageProviders.ts
  • apps/server/src/provider/builtInDrivers.ts
  • apps/web/src/components/usage/UsageProviderChart.test.ts
  • apps/web/src/components/usage/usageProviders.ts
  • docs/user/usage.md
  • package.json
  • packages/contracts/src/usage.ts

Generated by Claude Code

@LadyBluenotes

Copy link
Copy Markdown
Owner Author

@copilot resolve the merge conflicts on this branch.

@LadyBluenotes

Copy link
Copy Markdown
Owner Author

@copilot resolve the merge conflicts on this pull request by merging main into sync/upstream and pushing the result to this branch.

Rules:

  • Keep every line listed in docs/fork.md under "Upstream seams"; those lines are this fork's.
  • Everywhere else take upstream's side.
  • Regenerate apps/web/src/routeTree.gen.ts by running the web build instead of editing it.
  • Typecheck apps/server, packages/contracts and apps/web before you finish.

Conflicting files:

  • apps/mobile/src/features/usage/usageProviders.ts
  • apps/server/src/provider/builtInDrivers.ts
  • apps/web/src/components/usage/UsageProviderChart.test.ts
  • apps/web/src/components/usage/usageProviders.ts
  • docs/user/usage.md
  • package.json
  • packages/contracts/src/usage.ts

Copilot AI commented Oct 12, 2026 •

Copy link
Copy Markdown

@copilot resolve the merge conflicts on this branch.

Resolved and pushed the merge as 015c67d5.

@copilot resolve the merge conflicts on this pull request by merging main into sync/upstream and pushing the result to this branch.

Rules:...

Merged main into sync/upstream and pushed commit 015c67d5. The documented PluginHost seams are preserved; the web build and requested typechecks pass.

@LadyBluenotes
LadyBluenotes merged commit fa0c02f into main Oct 12, 2026
8 checks passed
@LadyBluenotes
LadyBluenotes deleted the sync/upstream branch October 12, 2026 01:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.