Repository navigation
Fork sync: upstream merge failed #26
Description
Merge of Yarden-zamir/t3code main and the adopted upstream pull requests into fork main stopped: merge conflict.
Auto-merging .github/workflows/fork-release.yml
CONFLICT (modify/delete): .github/workflows/fork-sync.yml deleted in upstream/main and modified in HEAD. Version HEAD of .github/workflows/fork-sync.yml left in tree.
Auto-merging AGENTS.md
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Auto-merging apps/mobile/app.config.ts
Auto-merging apps/mobile/src/Stack.tsx
Auto-merging apps/mobile/src/features/settings/components/ScheduledTaskPromptField.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/server/src/fork/forkWs.ts
Auto-merging apps/server/src/mcp/toolkits/project/handlers.ts
Auto-merging apps/server/src/observability/RpcInstrumentation.ts
CONFLICT (content): Merge conflict in apps/server/src/observability/RpcInstrumentation.ts
Auto-merging apps/server/src/server.ts
Auto-merging apps/server/src/ws.test.ts
Auto-merging apps/web/src/appInit.tsx
Auto-merging apps/web/src/components/Sidebar.tsx
Auto-merging apps/web/src/components/chat/OpenInPicker.browser.test.tsx
Auto-merging apps/web/src/components/settings/SettingsPanels.tsx
Auto-merging apps/web/src/components/settings/forkSettingsSearch.ts
Auto-merging apps/web/src/components/threadActionMenu.logic.ts
Auto-merging apps/web/src/index.css
Auto-merging apps/web/src/themePalette.ts
Auto-merging docs/fork-agents.md
CONFLICT (content): Merge conflict in docs/fork-agents.md
Auto-merging docs/fork/features.md
CONFLICT (content): Merge conflict in 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/orchestration.ts
Auto-merging packages/contracts/src/forkChangelog.ts
Auto-merging packages/contracts/src/forkRpc.ts
Auto-merging packages/contracts/src/forkSettings.ts
Auto-merging packages/contracts/src/machineMap.ts
CONFLICT (content): Merge conflict in packages/contracts/src/machineMap.ts
Auto-merging scripts/fork-release-notes.test.ts
Auto-merging scripts/fork-release-notes.ts
CONFLICT (content): Merge conflict in scripts/fork-release-notes.ts
Auto-merging scripts/install.sh
Automatic merge failed; fix conflicts and then commit the result.
UD .github/workflows/fork-sync.yml
UU README.md
UU apps/server/src/observability/RpcInstrumentation.ts
UU docs/fork-agents.md
UU docs/fork/features.md
UU docs/fork/operations.md
UU packages/contracts/src/machineMap.ts
UU scripts/fork-release-notes.ts
Activity
TomCohenDev commentedon Nov 9, 2026
Fork Sync run 42687519506 conflicted in 8 files. I resolved them in #27, which merged as e358ea2 after Fork CI passed. Upstream had deleted the Fork Sync workflow (Yarden now merges with an agent on a Mac). This fork has no such agent, so I kept the workflow; deleting it would have stopped upstream syncs. The PR body explains how to switch over. The portal at map.tomcohen.dev is no longer built from this repo. Machines now join with
kitshn join <code> --server <address>.