Skip to content

Upstream merge conflict #9

Open
Open
Upstream merge conflict#9

Description

@github-actions
github-actions
bot
opened on Oct 20, 2026

Merging upstream v0.1.1-nightly.20261020.3411 (d36b7da2485bc889b320a285deea181f637d760a) into custom conflicts in:

apps/web/src/components/settings/IntegrationsSettings.tsx
packages/contracts/src/settings.ts
packages/shared/src/cliRelease.ts
scripts/build-desktop-artifact.ts

Resolve it locally:

git fetch upstream && git checkout custom && git merge d36b7da2485bc889b320a285deea181f637d760a
# fix conflicts, commit, push

Builds stay on the last published version until this is resolved.
Run: https://github.com/YassinTM/t3code/actions/runs/39427218831

Activity

  1. github-actions commented on Oct 20, 2026

    @github-actions
    github-actionsBot
    on Oct 20, 2026 – with GitHub Actions
    Author

    Merging upstream v0.1.1-nightly.20261020.3411 (d36b7da2485bc889b320a285deea181f637d760a) into custom conflicts in:

    apps/web/src/components/settings/IntegrationsSettings.tsx
packages/contracts/src/settings.ts
packages/shared/src/cliRelease.ts
scripts/build-desktop-artifact.ts

    Resolve it locally:

    git fetch upstream && git checkout custom && git merge d36b7da2485bc889b320a285deea181f637d760a
# fix conflicts, commit, push

    Builds stay on the last published version until this is resolved.
    Run: https://github.com/YassinTM/t3code/actions/runs/39471141272

  2. github-actions commented on Oct 20, 2026

    @github-actions
    github-actionsBot
    on Oct 20, 2026 – with GitHub Actions
    Author

    Merging upstream v0.1.1-nightly.20261020.3411 (d36b7da2485bc889b320a285deea181f637d760a) into custom conflicts in:

    apps/web/src/components/settings/IntegrationsSettings.tsx
packages/contracts/src/settings.ts
packages/shared/src/cliRelease.ts
scripts/build-desktop-artifact.ts

    Resolve it locally:

    git fetch upstream && git checkout custom && git merge d36b7da2485bc889b320a285deea181f637d760a
# fix conflicts, commit, push

    Builds stay on the last published version until this is resolved.
    Run: https://github.com/YassinTM/t3code/actions/runs/39502762592

  3. github-actions commented on Oct 21, 2026

    @github-actions
    github-actionsBot
    on Oct 21, 2026 – with GitHub Actions
    Author

    Merging upstream v0.1.1-nightly.20261020.3438 (fe27e8e3dc12dcbb108e9a28fd9b8cb65f34ae92) into custom conflicts in:

    apps/web/src/components/settings/IntegrationsSettings.tsx
packages/contracts/src/settings.ts
packages/shared/src/cliRelease.ts
scripts/build-desktop-artifact.ts

    Resolve it locally:

    git fetch upstream && git checkout custom && git merge fe27e8e3dc12dcbb108e9a28fd9b8cb65f34ae92
# fix conflicts, commit, push

    Builds stay on the last published version until this is resolved.
    Run: https://github.com/YassinTM/t3code/actions/runs/39519812828

  4. github-actions commented on Oct 21, 2026

    @github-actions
    github-actionsBot
    on Oct 21, 2026 – with GitHub Actions
    Author

    Merging upstream v0.1.2-nightly.20261021.3457 (e64766c56ac6fc1678e6107052feb0047a35337f) into custom conflicts in:

    apps/web/src/components/settings/IntegrationsSettings.tsx
packages/client-runtime/src/voice-input/controller.test.ts
packages/contracts/src/settings.ts
packages/shared/src/cliRelease.test.ts
packages/shared/src/cliRelease.ts
packages/ssh/src/tunnel.test.ts
scripts/build-desktop-artifact.ts

    Resolve it locally:

    git fetch upstream && git checkout custom && git merge e64766c56ac6fc1678e6107052feb0047a35337f
# fix conflicts, commit, push

    Builds stay on the last published version until this is resolved.
    Run: https://github.com/YassinTM/t3code/actions/runs/39547251906

  5. github-actions commented on Oct 21, 2026

    @github-actions
    github-actionsBot
    on Oct 21, 2026 – with GitHub Actions
    Author

    Merging upstream v0.1.2-nightly.20261021.3457 (e64766c56ac6fc1678e6107052feb0047a35337f) into custom conflicts in:

    apps/web/src/components/settings/IntegrationsSettings.tsx
packages/client-runtime/src/voice-input/controller.test.ts
packages/contracts/src/settings.ts
packages/shared/src/cliRelease.test.ts
packages/shared/src/cliRelease.ts
packages/ssh/src/tunnel.test.ts
scripts/build-desktop-artifact.ts

    Resolve it locally:

    git fetch upstream && git checkout custom && git merge e64766c56ac6fc1678e6107052feb0047a35337f
# fix conflicts, commit, push

    Builds stay on the last published version until this is resolved.
    Run: https://github.com/YassinTM/t3code/actions/runs/39583759633

  6. github-actions commented on Oct 21, 2026

    @github-actions
    github-actionsBot
    on Oct 21, 2026 – with GitHub Actions
    Author

    Merging upstream v0.1.2-nightly.20261021.3473 (1688f965682d331da16a8c39f049592361f69c8d) into custom conflicts in:

    apps/web/src/components/chat/ChatComposer.tsx
apps/web/src/components/chat/MessagesTimeline.tsx
apps/web/src/components/settings/IntegrationsSettings.tsx
packages/client-runtime/src/voice-input/controller.test.ts
packages/contracts/src/settings.ts
packages/shared/src/cliRelease.test.ts
packages/shared/src/cliRelease.ts
packages/ssh/src/tunnel.test.ts
scripts/build-desktop-artifact.ts

    Resolve it locally:

    git fetch upstream && git checkout custom && git merge 1688f965682d331da16a8c39f049592361f69c8d
# fix conflicts, commit, push

    Builds stay on the last published version until this is resolved.
    Run: https://github.com/YassinTM/t3code/actions/runs/39625591395

  7. github-actions commented on Oct 21, 2026

    @github-actions
    github-actionsBot
    on Oct 21, 2026 – with GitHub Actions
    Author

    Merging upstream v0.1.2-nightly.20261021.3486 (680152e27b2a961686389ca69a1557cbb2c55f08) into custom conflicts in:

    apps/web/src/components/chat/ChatComposer.tsx
apps/web/src/components/chat/MessagesTimeline.tsx
apps/web/src/components/settings/IntegrationsSettings.tsx
apps/web/src/components/settings/KeybindingsSettings.logic.ts
packages/client-runtime/src/voice-input/controller.test.ts
packages/contracts/src/settings.ts
packages/shared/src/cliRelease.test.ts
packages/shared/src/cliRelease.ts
packages/ssh/src/tunnel.test.ts
scripts/build-desktop-artifact.ts

    Resolve it locally:

    git fetch upstream && git checkout custom && git merge 680152e27b2a961686389ca69a1557cbb2c55f08
# fix conflicts, commit, push

    Builds stay on the last published version until this is resolved.
    Run: https://github.com/YassinTM/t3code/actions/runs/39663790203

  8. github-actions commented on Oct 21, 2026

    @github-actions
    github-actionsBot
    on Oct 21, 2026 – with GitHub Actions
    Author

    Merging upstream v0.1.2-nightly.20261021.3486 (680152e27b2a961686389ca69a1557cbb2c55f08) into custom conflicts in:

    apps/web/src/components/chat/ChatComposer.tsx
apps/web/src/components/chat/MessagesTimeline.tsx
apps/web/src/components/settings/IntegrationsSettings.tsx
apps/web/src/components/settings/KeybindingsSettings.logic.ts
packages/client-runtime/src/voice-input/controller.test.ts
packages/contracts/src/settings.ts
packages/shared/src/cliRelease.test.ts
packages/shared/src/cliRelease.ts
packages/ssh/src/tunnel.test.ts
scripts/build-desktop-artifact.ts

    Resolve it locally:

    git fetch upstream && git checkout custom && git merge 680152e27b2a961686389ca69a1557cbb2c55f08
# fix conflicts, commit, push

    Builds stay on the last published version until this is resolved.
    Run: https://github.com/YassinTM/t3code/actions/runs/39689181815

  9. github-actions commented on Oct 22, 2026

    @github-actions
    github-actionsBot
    on Oct 22, 2026 – with GitHub Actions
    Author

    Merging upstream v0.1.2-nightly.20261021.3499 (b5a226e49c52ecab4ddc2d678a7012d97e651a6a) into custom conflicts in:

    apps/web/src/components/chat/ChatComposer.tsx
apps/web/src/components/chat/MessagesTimeline.tsx
apps/web/src/components/settings/IntegrationsSettings.tsx
apps/web/src/components/settings/KeybindingsSettings.logic.ts
packages/client-runtime/src/voice-input/controller.test.ts
packages/contracts/src/settings.ts
packages/shared/src/cliRelease.test.ts
packages/shared/src/cliRelease.ts
packages/ssh/src/tunnel.test.ts
scripts/build-desktop-artifact.ts

    Resolve it locally:

    git fetch upstream && git checkout custom && git merge b5a226e49c52ecab4ddc2d678a7012d97e651a6a
# fix conflicts, commit, push

    Builds stay on the last published version until this is resolved.
    Run: https://github.com/YassinTM/t3code/actions/runs/39703123447

  10. github-actions commented on Oct 22, 2026

    @github-actions
    github-actionsBot
    on Oct 22, 2026 – with GitHub Actions
    Author

    Merging upstream v0.1.2-nightly.20261021.3499 (b5a226e49c52ecab4ddc2d678a7012d97e651a6a) into custom conflicts in:

    apps/web/src/components/chat/ChatComposer.tsx
apps/web/src/components/chat/MessagesTimeline.tsx
apps/web/src/components/settings/IntegrationsSettings.tsx
apps/web/src/components/settings/KeybindingsSettings.logic.ts
packages/client-runtime/src/voice-input/controller.test.ts
packages/contracts/src/settings.ts
packages/shared/src/cliRelease.test.ts
packages/shared/src/cliRelease.ts
packages/ssh/src/tunnel.test.ts
scripts/build-desktop-artifact.ts

    Resolve it locally:

    git fetch upstream && git checkout custom && git merge b5a226e49c52ecab4ddc2d678a7012d97e651a6a
# fix conflicts, commit, push

    Builds stay on the last published version until this is resolved.
    Run: https://github.com/YassinTM/t3code/actions/runs/39732322453

  11. github-actions commented on Oct 22, 2026

    @github-actions
    github-actionsBot
    on Oct 22, 2026 – with GitHub Actions
    Author

    Merging upstream v0.1.2-nightly.20261022.3512 (3b95e7831b11b17627dff16843bc087bfca397ec) into custom conflicts in:

    apps/web/src/components/chat/ChatComposer.tsx
apps/web/src/components/chat/MessagesTimeline.tsx
apps/web/src/components/settings/IntegrationsSettings.tsx
apps/web/src/components/settings/KeybindingsSettings.logic.ts
packages/client-runtime/src/voice-input/controller.test.ts
packages/contracts/src/settings.ts
packages/shared/src/cliRelease.test.ts
packages/shared/src/cliRelease.ts
packages/ssh/src/tunnel.test.ts
scripts/build-desktop-artifact.ts

    Resolve it locally:

    git fetch upstream && git checkout custom && git merge 3b95e7831b11b17627dff16843bc087bfca397ec
# fix conflicts, commit, push

    Builds stay on the last published version until this is resolved.
    Run: https://github.com/YassinTM/t3code/actions/runs/39775730927

  12. github-actions commented on Oct 22, 2026

    @github-actions
    github-actionsBot
    on Oct 22, 2026 – with GitHub Actions
    Author

    Merging upstream v0.1.2-nightly.20261022.3526 (f054d1b8018721bd997d99cbb918a7b17bf098a4) into custom conflicts in:

    apps/web/src/components/chat/ChatComposer.tsx
apps/web/src/components/chat/MessagesTimeline.tsx
apps/web/src/components/settings/IntegrationsSettings.tsx
apps/web/src/components/settings/KeybindingsSettings.logic.ts
packages/client-runtime/src/voice-input/controller.test.ts
packages/contracts/src/settings.ts
packages/shared/src/cliRelease.test.ts
packages/shared/src/cliRelease.ts
packages/ssh/src/tunnel.test.ts
scripts/build-desktop-artifact.ts

    Resolve it locally:

    git fetch upstream && git checkout custom && git merge f054d1b8018721bd997d99cbb918a7b17bf098a4
# fix conflicts, commit, push

    Builds stay on the last published version until this is resolved.
    Run: https://github.com/YassinTM/t3code/actions/runs/39821894527

  13. github-actions commented on Oct 22, 2026

    @github-actions
    github-actionsBot
    on Oct 22, 2026 – with GitHub Actions
    Author

    Merging upstream v0.1.2-nightly.20261022.3541 (044f07257c9684ae4543bd1e1ebf9c394e9e3830) into custom conflicts in:

    apps/web/src/components/chat/ChatComposer.tsx
apps/web/src/components/chat/MessagesTimeline.tsx
apps/web/src/components/settings/IntegrationsSettings.tsx
apps/web/src/components/settings/KeybindingsSettings.logic.ts
packages/client-runtime/src/voice-input/controller.test.ts
packages/contracts/src/settings.ts
packages/shared/src/cliRelease.test.ts
packages/shared/src/cliRelease.ts
packages/ssh/src/tunnel.test.ts
scripts/build-desktop-artifact.ts

    Resolve it locally:

    git fetch upstream && git checkout custom && git merge 044f07257c9684ae4543bd1e1ebf9c394e9e3830
# fix conflicts, commit, push

    Builds stay on the last published version until this is resolved.
    Run: https://github.com/YassinTM/t3code/actions/runs/39850946968

  14. github-actions commented on Oct 22, 2026

    @github-actions
    github-actionsBot
    on Oct 22, 2026 – with GitHub Actions
    Author

    Merging upstream v0.1.2-nightly.20261022.3541 (044f07257c9684ae4543bd1e1ebf9c394e9e3830) into custom conflicts in:

    apps/web/src/components/chat/ChatComposer.tsx
apps/web/src/components/chat/MessagesTimeline.tsx
apps/web/src/components/settings/IntegrationsSettings.tsx
apps/web/src/components/settings/KeybindingsSettings.logic.ts
packages/client-runtime/src/voice-input/controller.test.ts
packages/contracts/src/settings.ts
packages/shared/src/cliRelease.test.ts
packages/shared/src/cliRelease.ts
packages/ssh/src/tunnel.test.ts
scripts/build-desktop-artifact.ts

    Resolve it locally:

    git fetch upstream && git checkout custom && git merge 044f07257c9684ae4543bd1e1ebf9c394e9e3830
# fix conflicts, commit, push

    Builds stay on the last published version until this is resolved.
    Run: https://github.com/YassinTM/t3code/actions/runs/39873381998

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