Skip to content

Fork sync: upstream merge failed #39

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

Auto-merging apps/mobile/src/Stack.tsx
Auto-merging apps/mobile/src/features/home/HomeRouteScreen.tsx
Auto-merging apps/mobile/src/features/settings/SettingsAboutRouteScreen.tsx
Auto-merging apps/mobile/src/features/settings/components/ScheduledTaskPromptField.tsx
Auto-merging apps/mobile/src/features/sharing/IncomingShareProvider.tsx
Auto-merging apps/mobile/src/features/sharing/incoming-share-inbox.ts
Auto-merging apps/mobile/src/features/threads/ThreadFeed.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/features/updates/app-updates.ts
CONFLICT (content): Merge conflict in apps/mobile/src/features/updates/app-updates.ts
Auto-merging apps/web/src/appInit.tsx
Auto-merging apps/web/src/components/Sidebar.tsx
CONFLICT (content): Merge conflict in apps/web/src/components/Sidebar.tsx
Auto-merging apps/web/src/components/settings/SettingsPanels.tsx
Auto-merging apps/web/src/components/settings/ThemeSettings.tsx
Auto-merging apps/web/src/components/threadActionMenu.logic.ts
Auto-merging apps/web/src/hooks/useThreadActionMenu.ts
Auto-merging apps/web/src/themePalette.ts
Auto-merging packages/client-runtime/package.json
Auto-merging packages/client-runtime/src/state/attachments.ts
Auto-merging packages/client-runtime/src/state/orchestration.ts
CONFLICT (content): Merge conflict in packages/client-runtime/src/state/orchestration.ts
Auto-merging packages/client-runtime/src/voice-input/controller.ts
Automatic merge failed; fix conflicts and then commit the result.
UU apps/mobile/src/features/threads/thread-list-v2-items.tsx
UU apps/mobile/src/features/updates/app-updates.ts
UU apps/web/src/components/Sidebar.tsx
UU packages/client-runtime/src/state/orchestration.ts

Activity

  1. TomCohenDev commented on Nov 18, 2026

    @TomCohenDev
    Owner

    Fork Sync run 44298423274 failed on merge conflicts in thread-list-v2-items.tsx, app-updates.ts, Sidebar.tsx and client-runtime orchestration.ts, from Yarden's i18n work meeting Tom's continue-thread-elsewhere and APK updater code. PR #40 resolves them and keeps both sides. It also wraps the fork's own copy for the new no-untranslated-copy lint rule and regenerates the catalogs. Fork CI is green and the PR is merged as 5427007. Closing.

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