diff --git a/.github/tevin-upstream-sync-conflicts.md b/.github/tevin-upstream-sync-conflicts.md new file mode 100644 index 0000000000000..bc4b49732b4df --- /dev/null +++ b/.github/tevin-upstream-sync-conflicts.md @@ -0,0 +1,21 @@ + + +# Upstream sync conflicts + +Written by the upstream sync workflow. Resolve the conflicts on this branch, delete this file, and push. + +- Failed while merging `pingdotgg/t3code` main into `automation/upstream-sync-2026-11-22`. +- Upstream range: `d51d8c4766f6c8760d5db9428596b98c4f81eab1`..`a985332c447173750394c0875fb961f88c306730` + +## Conflicting files (10) + +- `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`