Repository navigation
Upstream nightly v0.1.7-nightly.20261101.4016: make it merge and build on custom-nightly #205
Description
Upstream nightly v0.1.7-nightly.20261101.4016 from main does not yet merge and build on custom-nightly, so no custom build is published. Chamaquita fixes it and, because this issue carries automerge, merges her pull request once its checks pass.
Base branch: custom-nightly
Job branch: chamaquita/upstream-v0.1.7-nightly.20261101.4016
Upstream tag: v0.1.7-nightly.20261101.4016 from https://github.com/pingdotgg/t3code.git
Merging it stopped on conflicts in:
apps/web/src/components/chat/MarkdownCodeBlock.tsx
Task
- Start
chamaquita/upstream-v0.1.7-nightly.20261101.4016fromorigin/custom-nightly, or continue it if an earlier attempt pushed it. Ifgit merge-base --is-ancestor v0.1.7-nightly.20261101.4016 HEADfails, fetch the tag withgit fetch --no-tags https://github.com/pingdotgg/t3code.git tag v0.1.7-nightly.20261101.4016and merge it withgit merge --no-ff v0.1.7-nightly.20261101.4016. Never rebase, squash, or cherry-pick: the nightly decides what is merged with that ancestor check, so only a merge commit keeps the tag an ancestor. - 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.1.7-nightly.20261101.4016..origin/custom-nightly; upstream's is ingit log origin/custom-nightly..v0.1.7-nightly.20261101.4016and its pull requests. - Take upstream's
pnpm-lock.yamland runpnpm install --ignore-scriptsto reconcile it with the merged manifests.
- Fix whatever stops it building. Upstream moves and renames code without conflicts, so adapt the fork's code to upstream's changes rather than editing upstream files. If the failure is not in the code, such as a missing secret, code signing, or a runner problem, change nothing and finish blocked with the reason.
- Push
chamaquita/upstream-v0.1.7-nightly.20261101.4016and open a pull request intocustom-nightly. Its body starts withCloses #and this issue's number, then has a table with one row per conflicted hunk or fix 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. - Fork CI on the pull request typechecks and builds the desktop app. Chamaquita merges it once that passes, and the next nightly run publishes the build.
Run: https://github.com/d3labs-dev/t3code/actions/runs/41285569622
Activity
chamaquita-d3 commentedon Nov 1, 2026
Chamaquita started Attempt 1 of 2 on this issue, stamped by github-actions[bot], the repository's GitHub Actions.
automergestamped by github-actions[bot], the repository's GitHub Actions. Follow it in Discord: https://discord.com/channels/1497356507472466022/1564056102197403689chamaquita-d3 commentedon Nov 1, 2026
Attempt 1 of 2: Claude Code finished, waiting for GitHub CI
I merged the upstream tag as a merge commit; the tag is now an ancestor of the branch. The only conflict was the code block class list in MarkdownCodeBlock.tsx. I kept the fork's version, which drops the background classes because custom.css themes the block, and added upstream's new
text-start. I took upstream's pnpm-lock.yaml and ranpnpm install --ignore-scriptsto reconcile it with the merged manifests. Upstream deleted or renamed no files relative to custom-nightly, so I made no other fixes. I did not run typecheck or build locally, as instructed, so fork CI on the pull request is the check. I pushed the branch and opened PR #206 into custom-nightly, whose body starts with "Closes #205" and has the conflict table.Pull request: #206
Branch:
chamaquita/upstream-v0.1.7-nightly.20261101.4016Claude Code session:
86219a2a-5d67-455f-8414-74696865ca4fChamaquita merges it once GitHub CI passes on commit 29f9648. If no check has started by 07:49 UTC, or some still run at 08:09 UTC, a person takes it from there.
In Discord: https://discord.com/channels/1497356507472466022/1564056102197403689/1566355798882258945
chamaquita-d3 commentedon Nov 1, 2026
Attempt 1 of 2 finished: success
I merged the upstream tag as a merge commit; the tag is now an ancestor of the branch. The only conflict was the code block class list in MarkdownCodeBlock.tsx. I kept the fork's version, which drops the background classes because custom.css themes the block, and added upstream's new
text-start. I took upstream's pnpm-lock.yaml and ranpnpm install --ignore-scriptsto reconcile it with the merged manifests. Upstream deleted or renamed no files relative to custom-nightly, so I made no other fixes. I did not run typecheck or build locally, as instructed, so fork CI on the pull request is the check. I pushed the branch and opened PR #206 into custom-nightly, whose body starts with "Closes #205" and has the conflict table.Pull request: #206 (merged)
Branch:
chamaquita/upstream-v0.1.7-nightly.20261101.4016Claude Code session:
86219a2a-5d67-455f-8414-74696865ca4fGitHub CI passed on commit 29f9648.
Merged into
custom-nightlyas merge commit 16af5eb, because the issue carriesautomergeand GitHub CI passed.In Discord: https://discord.com/channels/1497356507472466022/1564056102197403689/1566355798882258945