Skip to content

Upstream nightly v0.0.43-nightly.20260925.2251 conflicts with custom-nightly #11

Closed
#16
Closed
Upstream nightly v0.0.43-nightly.20260925.2251 conflicts with custom-nightly#11
#16
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 25, 2026

@DiegoJohnsonL merging upstream nightly v0.0.43-nightly.20260925.2251 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.20260925.2251
Upstream tag: v0.0.43-nightly.20260925.2251 from https://github.com/pingdotgg/t3code.git

Conflicted files:

  • apps/desktop/src/updates/DesktopUpdates.test.ts
  • apps/web/src/components/CommandPalette.tsx
  • apps/web/src/components/sidebar/SidebarChrome.tsx
  • docs/user/usage.md

Task

  1. Start chamaquita/upstream-v0.0.43-nightly.20260925.2251 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.20260925.2251 and merge it with git merge --no-ff v0.0.43-nightly.20260925.2251. Never rebase, squash, or cherry-pick: the nightly decides what is new with git merge-base --is-ancestor v0.0.43-nightly.20260925.2251 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.20260925.2251..origin/custom-nightly; upstream's is in git log origin/custom-nightly..v0.0.43-nightly.20260925.2251 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. Run the fork's checks on the merged tree. Each must pass:
    • pnpm install --frozen-lockfile
    • pnpm run typecheck
    • pnpm exec vp fmt --check
    • pnpm exec vp lint on each file you resolved, adding no error that file does not already have on custom-nightly, whose styling already fails shadcn(no-restyle)
    • pnpm exec vp run --filter t3 test
    • pnpm exec vp run --parallel --concurrency-limit 2 --filter '!t3' --filter '!@t3tools/monorepo' test
    • pnpm run build:desktop
  4. Commit the merge, push chamaquita/upstream-v0.0.43-nightly.20260925.2251, 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, followed by each check and its result. If a push is refused for the workflows permission, change nothing and finish blocked with that reason.
  5. Report whether every check passed. Chamaquita merges the pull request as a merge commit only then, and only when GitHub finds it mergeable. The next run finds the tag merged, publishes the build, and closes this issue.

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

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 25, 2026

  2. chamaquita-d3 commented on Sep 25, 2026

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

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

  3. chamaquita-d3 commented on Sep 25, 2026

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

    Attempt 1 of 2 finished: blocked
    Chamaquita could not start this Attempt: Workstation script failed (exit 100): W: Failed to fetch https://archive.ubuntu.com/ubuntu/dists/resolute/InRelease Temporary failure resolving 'archive.ubuntu.com'
    W: Failed to fetch https://archive.ubuntu.com/ubuntu/dists/resolute-updates/InRelease Temporary failure resolving 'archive.ubuntu.com'
    W: Failed to fetch https://archive.ubuntu.com/ubuntu/dists/resolute-backports/InRelease Temporary failure resolving 'archive.ubuntu.com'
    W: Failed to fetch https://security.ubuntu.com/ubuntu/dists/resolute-security/InRelease Temporary failure resolving 'security.ubuntu.com'
    W: Some index files failed to download. They have been ignored, or old ones used instead.
    E: Package 'make' has no installation candidate
    E: Unable to locate package pkg-config
    E: Unable to locate package libsecret-1-dev

    Remove the chamaquita label and add it again to start the next Attempt.

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

  4. DiegoJohnsonL
    added
    chamaquitaChamaquita works this issue as a Job
    and removed
    chamaquitaChamaquita works this issue as a Job
    on Sep 25, 2026

  5. chamaquita-d3 commented on Sep 25, 2026

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

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

  6. chamaquita-d3 commented on Sep 25, 2026

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

    Attempt 1 of 2 could not start: The Runner 260bd71bbd9721e2 did not start within 30 seconds.
    Chamaquita retries at 15:07 UTC (retry 1 of 3). Claude Code has not run yet, so this does not use the Attempt up.

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

  7. chamaquita-d3 commented on Sep 25, 2026

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

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

  8. chamaquita-d3 commented on Sep 25, 2026

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

    Paused: Claude usage limit, resumes at 15:20 UTC.

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

  9. chamaquita-d3 commented on Sep 25, 2026

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

    Attempt 1 of 2 finished: success
    Merged upstream v0.0.43-nightly.20260925.2251 into custom-nightly as a merge commit and opened draft PR #16 (Fixes #11), which GitHub reports as mergeable. All four conflicts kept both sides: both new desktop-update tests; both shortcut handlers (mod+u usage also closes the fork's sidebar usage panel); in the sidebar, Back closes the fork's panel first, then uses upstream's return-to-last-main-app-page navigation; both usage-doc sections. The lockfile reconciles to custom-nightly's exactly. A separate commit adds .js extensions to two fork-only imports in packages/shared that were failing typecheck; the merge didn't cause that. Install, typecheck, fmt, lint on resolved files, both test suites, and build:desktop all passed. Note: on the first run, 7 server tests failed because this job machine gives processes every capability, so chmod-based permission errors never happen. With capabilities dropped (setpriv), both suites pass in full. CI is unaffected.
    Pull request: #16 (merged)
    Branch: chamaquita/upstream-v0.0.43-nightly.20260925.2251
    Merged into custom-nightly as merge commit c483368, because the issue carries automerge and the checks passed.

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

  10. chamaquita-d3
    closed this as completedin #16on Sep 25, 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