Repository navigation
Fork sync: upstream merge failed #16
Description
Merge of Yarden-zamir/t3code main into fork main stopped: merge conflict.
Run: https://github.com/TomCohenDev/t3code/actions/runs/39875286900
Auto-merging .github/workflows/fork-sync.yml
Auto-merging AGENTS.md
Auto-merging README.md
Auto-merging apps/machine-map/SPEC.md
Auto-merging apps/machine-map/src/MachineMapObject.ts
Auto-merging apps/machine-map/src/api.ts
Auto-merging apps/machine-map/src/ui/App.tsx
Auto-merging apps/machine-map/src/ui/style.css
Auto-merging apps/machine-map/src/ui/views.tsx
Auto-merging apps/mobile/src/Stack.tsx
Auto-merging apps/mobile/src/features/threads/thread-list-v2-items.tsx
CONFLICT (content): Merge conflict in apps/mobile/src/features/threads/thread-list-v2-items.tsx
Auto-merging apps/mobile/src/persistence/mobile-preferences.ts
Auto-merging apps/server/src/fork/machineMap/MachinePeers.ts
CONFLICT (content): Merge conflict in apps/server/src/fork/machineMap/MachinePeers.ts
Auto-merging apps/server/src/server.ts
Auto-merging apps/server/src/ws.test.ts
Auto-merging apps/web/src/components/Sidebar.tsx
Auto-merging apps/web/src/components/settings/ForkSettings.tsx
Auto-merging apps/web/src/components/settings/ForkSettingsPanelRows.tsx
Auto-merging apps/web/src/components/settings/forkSettingsCatalog.ts
Auto-merging apps/web/src/components/settings/forkSettingsRegistration.test.ts
CONFLICT (content): Merge conflict in apps/web/src/components/settings/forkSettingsRegistration.test.ts
Auto-merging apps/web/src/components/settings/forkSettingsRestore.ts
Auto-merging apps/web/src/components/settings/forkSettingsSearch.ts
Auto-merging docs/fork-agents.md
Auto-merging docs/fork/features.md
Auto-merging docs/fork/operations.md
CONFLICT (content): Merge conflict in docs/fork/operations.md
Auto-merging packages/client-runtime/package.json
Auto-merging packages/client-runtime/src/state/sidebarTabs.ts
CONFLICT (content): Merge conflict in packages/client-runtime/src/state/sidebarTabs.ts
Auto-merging packages/contracts/src/forkSettings.ts
CONFLICT (content): Merge conflict in packages/contracts/src/forkSettings.ts
Auto-merging packages/contracts/src/index.ts
Auto-merging packages/contracts/src/machineMap.ts
Auto-merging packages/contracts/src/machineMapClient.ts
Auto-merging scripts/fork-daily-release-data.ts
Automatic merge failed; fix conflicts and then commit the result.
UU apps/mobile/src/features/threads/thread-list-v2-items.tsx
UU apps/server/src/fork/machineMap/MachinePeers.ts
UU apps/web/src/components/settings/forkSettingsRegistration.test.ts
UU docs/fork/operations.md
UU packages/client-runtime/src/state/sidebarTabs.ts
UU packages/contracts/src/forkSettings.ts
Activity
TomCohenDev commentedon Oct 23, 2026
Repair agent: run 39875286900 hit merge conflicts in 6 files, mostly from Yarden renaming sidebar groups to tabs. I resolved them in #17, keeping Tom's features. Typecheck and the fork tests pass locally, and Fork CI is running. I'll close this once #17 merges.
TomCohenDev commentedon Oct 23, 2026
Repair agent: #17 merged after Fork CI passed. Yarden's main is in the fork again. Closing.