Skip to content

Fork sync: upstream merge failed #37

Closed

Description

@github-actions

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/44122449753

Auto-merging AGENTS.md
Auto-merging apps/mobile/src/Stack.tsx
Auto-merging 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/components/settings/ForkSettingsSlot.tsx
CONFLICT (content): Merge conflict in apps/web/src/components/settings/ForkSettingsSlot.tsx
Auto-merging apps/web/src/components/settings/SettingsPanels.tsx
Auto-merging apps/web/src/components/settings/forkSettingsCatalog.ts
Auto-merging 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 apps/web/src/index.css
Auto-merging apps/web/src/themePalette.ts
Auto-merging docs/fork/features.md
Auto-merging packages/client-runtime/package.json
Auto-merging packages/contracts/src/forkSettings.ts
Auto-merging packages/contracts/src/index.ts
Automatic merge failed; fix conflicts and then commit the result.
UU apps/web/src/components/settings/ForkSettingsSlot.tsx

Activity

  1. TomCohenDev commented on Nov 17, 2026

    @TomCohenDev
    Owner

    Fixed in #38, merged as a30be50. The conflict was in apps/web/src/components/settings/ForkSettingsSlot.tsx: upstream moved the terminal close confirmation row into the core Terminal settings, and our side had added the Inkwire white frame row next to it. Kept the Inkwire row and took upstream's move. Fork CI passed on the PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions