Skip to content

T3-Turbo rebase needs review: v0.0.39 #52

Description

@github-actions

T3-Turbo nightly rebase needs review

  • Previous official nightly: v0.0.33-nightly.20260809.1042 (1a003e383ac6b10258b8100c2617d938c4f06c69)
  • Candidate official nightly: v0.0.39 (official v0.0.33-nightly.20260810.1054 plus upstream main) (f21d5e444e9a6b5876253ca8618a4dc8d4f2146c)

The automation stopped without resolving or publishing anything.

Files changed by both upstream and Turbo

  • apps/web/src/components/Sidebar.tsx
  • apps/web/src/components/chat/ChatHeader.tsx
  • apps/web/src/components/settings/SettingsSidebarNav.tsx
  • apps/web/src/components/settings/settingsSearch.test.ts
  • apps/web/src/components/settings/settingsSearch.ts
  • apps/web/src/routeTree.gen.ts

Unmerged paths reported by Git

  • docs/README.md

Rebase error

Rebasing (1/79)
Rebasing (2/79)
error: could not apply 0fd4e6b2... docs(turbo): record fork policy, seams, and operator runbooks
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply 0fd4e6b2... # docs(turbo): record fork policy, seams, and operator runbooks

Review and retry

  • Open this Actions run
  • Open the manual build page
  • Create repair/turbo-nightly-31346282960 from the unchanged turbo branch.
  • Replay or amend the Turbo customization that collided, run the manifest verifier and its focused seam tests, then open a reviewed PR back to turbo.
  • If the workflow changes, land the identical workflow blob on main before retrying. Do not hand-edit the upstream checkpoint or publish partial artifacts.
  • CLI retry: gh workflow run turbo-nightly-sync.yml -R gfsaaser24/t3code --ref main

Metadata

Metadata

Assignees

Labels

No labels
No labels

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions