Repository navigation
Fork sync: upstream merge failed #33
Description
Merge of Yarden-zamir/t3code main and the adopted upstream pull requests into fork main stopped: merge conflict.
Run: https://github.com/TomCohenDev/t3code/actions/runs/43625277360
Auto-merging apps/desktop/scripts/ensure-electron-runtime.mjs
Auto-merging apps/mobile/src/features/threads/ThreadFeed.tsx
CONFLICT (content): Merge conflict in apps/mobile/src/features/threads/ThreadFeed.tsx
Auto-merging apps/mobile/src/features/threads/thread-list-v2-items.tsx
Auto-merging apps/server/src/project/ProjectService.ts
Auto-merging apps/web/src/components/settings/SettingsPanels.tsx
Auto-merging packages/client-runtime/package.json
Auto-merging packages/client-runtime/src/state/orchestration.ts
Automatic merge failed; fix conflicts and then commit the result.
UU apps/mobile/src/features/threads/ThreadFeed.tsx
Activity
TomCohenDev commentedon Nov 14, 2026
Fixed in #34, merged as 5b54b1f. The conflict was in
apps/mobile/src/features/threads/ThreadFeed.tsx. The fix keeps upstream's new insetViewaround the unavailable-thread placeholder, with the fork's continue-elsewhere button inside it. A second commit fixes the formatting that Lint flagged. Fork CI passed: 20 checks.