Repository navigation
Fork sync: upstream merge failed #28
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/42750655975
Auto-merging apps/mobile/app.config.ts
Auto-merging apps/mobile/src/features/home/HomeRouteScreen.tsx
CONFLICT (content): Merge conflict in apps/mobile/src/features/home/HomeRouteScreen.tsx
Auto-merging apps/mobile/src/features/threads/ThreadFeed.tsx
Auto-merging apps/mobile/src/features/threads/thread-list-v2-items.tsx
Auto-merging apps/mobile/src/lib/filePreview.test.ts
Auto-merging apps/web/src/components/settings/SettingsPanels.tsx
Auto-merging apps/web/src/index.css
Auto-merging packages/client-runtime/package.json
Automatic merge failed; fix conflicts and then commit the result.
UU apps/mobile/src/features/home/HomeRouteScreen.tsx
Activity
TomCohenDev commentedon Nov 10, 2026
Run 42750655975 failed on one merge conflict, in the imports of apps/mobile/src/features/home/HomeRouteScreen.tsx. Both sides are kept: Yarden's useWorkspacePaneState and the fork's UpdateReadyBadge. Resolved in #29, which merged after Fork CI passed.