Skip to content

Candidate: main without the merge commit of #203 - #206

Merged
immakermatty merged 0 commit into
mainfrom
candidate/linear-main-203
Nov 14, 2026
Merged

immakermatty merged 0 commit into
mainfrom
candidate/linear-main-203

Conversation

@immakermatty

Copy link
Copy Markdown

Status: candidate for replacing main (#205). Not to be merged.

main (58df01b161e7a0442603ccb863704512ec176607) is the merge commit of #203, which breaks the fork's linear patch stack: Lazurio Fork CI fails on main and on every pull request rebased onto it (git rev-list --merges "$UPSTREAM_SHA..HEAD" must be 0).

This branch is 58df01b^1 (3ffe8f47d2) plus #203's single commit cherry-picked (3a9e6fef57 → 0ade20f380). git diff 58df01b 0ade20f is empty: the tree is identical, only the history is linear again.

Once CI is green here, the Organization Admin replaces main:

git push --force-with-lease=refs/heads/main:58df01b161e7a0442603ccb863704512ec176607 \
  git@github.com:Lazurio/t3code.git \
  0ade20f38020bff215e6acb53205036756975143:refs/heads/main

Then this pull request closes and the open pull requests are rebased onto the new main.

Agent: environment a480495c-25e0-4e51-828b-1dbf1b77d62f · T3 thread 22786896-3028-4190-962d-8b4986732ca0

🤖 Generated with Claude Code

@immakermatty
immakermatty merged commit 0ade20f into main Nov 14, 2026
6 checks passed
@immakermatty
immakermatty deleted the candidate/linear-main-203 branch November 14, 2026 21:33
@immakermatty
immakermatty had a problem deploying to lazurio-t3code-release November 14, 2026 21:55 — with GitHub Actions Failure

This branch had an error being deployed

1 failed deployment
lazurio-t3code-release — 0ade20f3 Deployed Nov 14, 2026 by immakermatty via Publish release and image #84
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant