Skip to content

Upstream nightly v0.0.43-nightly.20260927.2344 conflicts with custom-nightly #22

Closed
Closed
Upstream nightly v0.0.43-nightly.20260927.2344 conflicts with custom-nightly#22
Labels
automergeChamaquita merges the Job's pull request once its checks passchamaquitaChamaquita works this issue as a Job

Description

@github-actions
github-actions
bot
opened on Sep 27, 2026

@DiegoJohnsonL merging upstream nightly v0.0.43-nightly.20260927.2344 into custom-nightly stopped on conflicts, so no custom build is published until they are resolved. Chamaquita resolves them and, because this issue carries automerge, merges its pull request once every check passes.

Base branch: custom-nightly
Job branch: chamaquita/upstream-v0.0.43-nightly.20260927.2344
Upstream tag: v0.0.43-nightly.20260927.2344 from https://github.com/pingdotgg/t3code.git

Conflicted files:

  • apps/web/src/components/NoProjectsHero.tsx
  • apps/web/src/components/chat/ComposerSurface.tsx
  • apps/web/src/components/chat/MessagesTimeline.tsx
  • apps/web/src/components/settings/SettingsPanels.tsx
  • apps/web/src/routes/__root.tsx

Task

Do not run the repository's checks, builds, or test suites locally: GitHub CI runs them on the pull request.

  1. Start chamaquita/upstream-v0.0.43-nightly.20260927.2344 from origin/custom-nightly, or continue it if an earlier attempt pushed it. Fetch the tag with git fetch --no-tags https://github.com/pingdotgg/t3code.git tag v0.0.43-nightly.20260927.2344 and merge it with git merge --no-ff v0.0.43-nightly.20260927.2344. Never rebase, squash, or cherry-pick: the nightly decides what is new with git merge-base --is-ancestor v0.0.43-nightly.20260927.2344 HEAD, so only a merge commit keeps the tag an ancestor.
  2. Resolve each conflicted hunk:
    • Classify it as disjoint (the sides changed different things, so keep both), same question with different answers (pick one side on the evidence), or superseded (one side's change makes the other's moot).
    • Touch only the conflicted regions, and leave every line git merged cleanly as it is.
    • Keep the fork's customizations and take upstream's changes. The fork's intent is in git log v0.0.43-nightly.20260927.2344..origin/custom-nightly; upstream's is in git log origin/custom-nightly..v0.0.43-nightly.20260927.2344 and its pull requests.
    • Regenerate lockfiles and generated files instead of merging them by hand: take upstream's pnpm-lock.yaml and run pnpm install to reconcile it with the merged manifests.
    • Leave no conflict markers: git grep -nE '^(<<<<<<<|>>>>>>>) ' finds nothing.
  3. Commit the merge, push chamaquita/upstream-v0.0.43-nightly.20260927.2344, and open a pull request into custom-nightly. Its body has a table with one row per conflicted hunk and the columns File:lines, Class, custom-nightly, Upstream, Kept, and Why. If a push is refused for the workflows permission, change nothing and finish blocked with that reason.
  4. GitHub CI runs the fork's checks on the pull request. Chamaquita merges it as a merge commit once every check passes and GitHub finds it mergeable; if CI fails, Chamaquita hands the failures to the next attempt. The next run finds the tag merged, publishes the build, and closes this issue.

Run: https://github.com/d3labs-dev/t3code/actions/runs/36313883836

Activity

  1. github-actions
    added
    chamaquitaChamaquita works this issue as a Job
    automergeChamaquita merges the Job's pull request once its checks pass
    on Sep 27, 2026

  2. chamaquita-d3 commented on Sep 27, 2026

    @chamaquita-d3
    chamaquita-d3bot
    on Sep 27, 2026

    Chamaquita started Attempt 1 of 2 on this issue. Follow it in Discord: https://discord.com/channels/1497356507472466022/1553720957955342447

  3. chamaquita-d3 commented on Sep 27, 2026

    @chamaquita-d3
    chamaquita-d3bot
    on Sep 27, 2026

    Attempt 1 of 2: Claude Code finished, waiting for GitHub CI
    I merged upstream v0.0.43-nightly.20260927.2344 into custom-nightly as a --no-ff merge commit, so the tag is an ancestor of the branch. The pull request is PR #23. It is ready for review, not a draft, and says "Fixes #22". Nothing ran locally; GitHub CI runs the checks on the pull request.

    All six conflicted hunks, across five files, were disjoint, so I kept both sides in each:

    • Imports and mounts: NoProjectsHero gets both the background picture and the new desktop titlebar strip. __root mounts both MascotMoodCoordinator and QueuedMessageSender.
    • Settings reset: the restore-defaults list includes both the fork's background settings and upstream's chatWidth.
    • Composer and message list: they now use upstream's max-w-(--chat-max-width) width. The composer keeps the fork's glass surface. The message list keeps the fork's [contain:inline-size], which the reply bubble blur relies on.

    pnpm-lock.yaml merged without conflicts. As the task asks, I still replaced it with upstream's copy and ran pnpm install --lockfile-only --ignore-scripts to bring it in line with the merged package.json files. The pull request body has the per-hunk table.
    Pull request: #23
    Branch: chamaquita/upstream-v0.0.43-nightly.20260927.2344
    Chamaquita merges it once GitHub CI passes on commit 2ef2dee. If no check has started by 11:13 UTC, or some still run at 11:53 UTC, a person takes it from there.

    Discord thread: https://discord.com/channels/1497356507472466022/1553720957955342447

  4. chamaquita-d3 commented on Sep 27, 2026

    @chamaquita-d3
    chamaquita-d3bot
    on Sep 27, 2026

    Attempt 1 of 2 finished: flawed
    I merged upstream v0.0.43-nightly.20260927.2344 into custom-nightly as a --no-ff merge commit, so the tag is an ancestor of the branch. The pull request is PR #23. It is ready for review, not a draft, and says "Fixes #22". Nothing ran locally; GitHub CI runs the checks on the pull request.

    All six conflicted hunks, across five files, were disjoint, so I kept both sides in each:

    • Imports and mounts: NoProjectsHero gets both the background picture and the new desktop titlebar strip. __root mounts both MascotMoodCoordinator and QueuedMessageSender.
    • Settings reset: the restore-defaults list includes both the fork's background settings and upstream's chatWidth.
    • Composer and message list: they now use upstream's max-w-(--chat-max-width) width. The composer keeps the fork's glass surface. The message list keeps the fork's [contain:inline-size], which the reply bubble blur relies on.

    pnpm-lock.yaml merged without conflicts. As the task asks, I still replaced it with upstream's copy and ran pnpm install --lockfile-only --ignore-scripts to bring it in line with the merged package.json files. The pull request body has the per-hunk table.
    Pull request: #23
    Branch: chamaquita/upstream-v0.0.43-nightly.20260927.2344
    GitHub CI failed on commit 2ef2dee:

    Discord thread: https://discord.com/channels/1497356507472466022/1553720957955342447

  5. chamaquita-d3 commented on Sep 27, 2026

    @chamaquita-d3
    chamaquita-d3bot
    on Sep 27, 2026

    Chamaquita started Attempt 2 of 2 on this issue because GitHub CI failed on its pull request. Follow it in Discord: https://discord.com/channels/1497356507472466022/1553720957955342447

  6. chamaquita-d3 commented on Sep 27, 2026

    @chamaquita-d3
    chamaquita-d3bot
    on Sep 27, 2026

    Attempt 2 of 2: Claude Code finished, waiting for GitHub CI
    The Test check on PR #23 failed on one test: upstream's new encodeShellSnapshotForCache test (from pingdotgg#13767) in packages/client-runtime/src/platform/persistence.test.ts. It generates 2000 sample values and took 6.2s on GitHub's hosted runners, over the 5s default timeout. The fork doesn't change the schemas it uses, so this was a speed problem, not a merge mistake. The CI log showed no other failing tests; the other three failed tasks were stopped after this one. I gave that test a 30s timeout and pushed the commit (bce3b69). I didn't run the test locally, so the next CI run on the PR is the first check of the fix. The PR is still open, not a draft, and still says "Fixes #22"; its body now has a short follow-up note about this change.
    Pull request: #23
    Branch: chamaquita/upstream-v0.0.43-nightly.20260927.2344
    Chamaquita merges it once GitHub CI passes on commit bce3b69. If no check has started by 11:21 UTC, or some still run at 12:01 UTC, a person takes it from there.

    Discord thread: https://discord.com/channels/1497356507472466022/1553720957955342447

  7. chamaquita-d3 commented on Sep 27, 2026

    @chamaquita-d3
    chamaquita-d3bot
    on Sep 27, 2026

    Attempt 2 of 2 finished: flawed
    The Test check on PR #23 failed on one test: upstream's new encodeShellSnapshotForCache test (from pingdotgg#13767) in packages/client-runtime/src/platform/persistence.test.ts. It generates 2000 sample values and took 6.2s on GitHub's hosted runners, over the 5s default timeout. The fork doesn't change the schemas it uses, so this was a speed problem, not a merge mistake. The CI log showed no other failing tests; the other three failed tasks were stopped after this one. I gave that test a 30s timeout and pushed the commit (bce3b69). I didn't run the test locally, so the next CI run on the PR is the first check of the fix. The PR is still open, not a draft, and still says "Fixes #22"; its body now has a short follow-up note about this change.
    Pull request: #23
    Branch: chamaquita/upstream-v0.0.43-nightly.20260927.2344
    GitHub CI failed on commit bce3b69:

    Discord thread: https://discord.com/channels/1497356507472466022/1553720957955342447

  8. DiegoJohnsonL commented on Sep 27, 2026

    @DiegoJohnsonL
    DiegoJohnsonL
    on Sep 27, 2026
    Collaborator

    Closing to retry from scratch with the CI timeout and formatter fixes; the nightly files a fresh issue for this conflict.

  9. DiegoJohnsonL
    closed this as completedon Sep 27, 2026
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

    automergeChamaquita merges the Job's pull request once its checks passchamaquitaChamaquita works this issue as a Job

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions