Skip to content

chore: sync upstream pingdotgg/t3code - #188

Draft
polymaniadeveloper-hub wants to merge 1 commit into
masterfrom
automation/upstream-sync-2026-11-22
Draft

polymaniadeveloper-hub wants to merge 1 commit into
masterfrom
automation/upstream-sync-2026-11-22

Conversation

@polymaniadeveloper-hub

Copy link
Copy Markdown
Collaborator

Upstream sync is pending: 10 file(s) conflicted while merging pingdotgg/t3code main into automation/upstream-sync-2026-11-22.

  • Last upstream commit already in master: d51d8c4766f6c8760d5db9428596b98c4f81eab1
  • Upstream main commit to merge: a985332c447173750394c0875fb961f88c306730 (174 commit(s))
  • Range: d51d8c4766f6...a985332c4471

Conflicting files:

  • apps/server/src/issue/linkedThreads.ts
  • apps/server/src/mcp/OrchestratorMcpService.ts
  • apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts
  • apps/server/src/orchestration-v2/ProviderTurnStartService.ts
  • apps/server/src/provider/agentContextBudget.json
  • apps/web/src/components/ChatMarkdown.tsx
  • apps/web/src/components/ChatView.tsx
  • apps/web/src/components/chat/ChatComposer.tsx
  • apps/web/src/components/chat/ThreadRelationshipsControl.browser.test.tsx
  • packages/shared/src/usageLimitsCopy.ts

To resolve: check out automation/upstream-sync-2026-11-22, run git merge a985332c447173750394c0875fb961f88c306730, resolve the files, delete .github/tevin-upstream-sync-conflicts.md, commit and push to the same branch.

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.

1 participant