The automation stopped without resolving or publishing anything.
Rebasing (1/154)
Rebasing (2/154)
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
T3-Turbo nightly rebase needs review
v0.0.33-nightly.20260809.1042(1a003e383ac6b10258b8100c2617d938c4f06c69)v0.0.43 (official v0.0.34-nightly.20260813.1084 plus upstream main)(5015d7cf9f98fe551115b625031f01e3f022cd2d)The automation stopped without resolving or publishing anything.
Files changed by both upstream and Turbo
.github/workflows/mobile-eas-production.yml.github/workflows/mobile-fingerprint-check.yml.github/workflows/release.ymlapps/desktop/package.jsonapps/desktop/src/electron/ElectronDialog.test.tsapps/desktop/src/electron/ElectronDialog.tsapps/desktop/src/ipc/DesktopIpcHandlers.tsapps/desktop/src/ipc/channels.tsapps/desktop/src/ipc/methods/window.tsapps/desktop/src/preload.tsapps/desktop/src/shell/DesktopShellEnvironment.test.tsapps/desktop/src/shell/DesktopShellEnvironment.tsapps/desktop/src/window/DesktopApplicationMenu.test.tsapps/mobile/app.config.tsapps/mobile/package.jsonapps/mobile/plugins/withAndroidTabletOrientation.cjsapps/mobile/src/Stack.tsxapps/mobile/src/components/ControlPill.tsxapps/mobile/src/features/archive/ArchivedThreadsRouteScreen.tsxapps/mobile/src/features/cloud/ClerkSettingsSheetDetent.tsxapps/mobile/src/features/cloud/connectOnboardingNavigation.tsapps/mobile/src/features/home/HomeRouteScreen.tsxapps/mobile/src/features/home/HomeScreen.tsxapps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsxapps/mobile/src/features/settings/SettingsAuthRouteScreen.tsxapps/mobile/src/features/settings/SettingsEnvironmentsRouteScreen.tsxapps/mobile/src/features/settings/SettingsRouteScreen.tsxapps/mobile/src/features/settings/components/SettingsRow.tsxapps/mobile/src/features/showcase/ShowcaseCaptureCoordinator.tsxapps/mobile/src/features/threads/NewTaskDraftScreen.tsxapps/mobile/src/features/threads/PendingUserInputCard.tsxapps/mobile/src/features/threads/ThreadComposer.tsxapps/mobile/src/features/threads/ThreadDetailScreen.tsxapps/mobile/src/features/threads/ThreadFeed.tsxapps/mobile/src/features/threads/ThreadNavigationSidebar.tsxapps/mobile/src/features/threads/ThreadSettingsSheet.tsxapps/mobile/src/features/threads/pendingUserInputLayout.test.tsapps/mobile/src/features/threads/pendingUserInputLayout.tsapps/mobile/src/features/threads/thread-feed-live-follow.test.tsapps/mobile/src/features/threads/thread-feed-live-follow.tsapps/mobile/src/features/threads/thread-list-v2-items.tsxapps/mobile/src/features/threads/thread-settings-menu.test.tsapps/mobile/src/features/threads/thread-settings-menu.tsapps/mobile/src/features/updates/app-updates.test.tsapps/mobile/src/features/updates/app-updates.tsapps/mobile/src/features/usage/UsageRouteScreen.tsxapps/mobile/src/lib/threadActivity.test.tsapps/mobile/src/lib/threadActivity.tsapps/mobile/src/lib/wideMarkdownBlocks.test.tsapps/mobile/src/lib/wideMarkdownBlocks.tsapps/mobile/src/state/usage.tsapps/mobile/src/state/use-selected-thread-requests.tsapps/server/package.jsonapps/server/src/auth/RpcAuthorization.test.tsapps/server/src/auth/RpcAuthorization.tsapps/server/src/cloud/bootService.test.tsapps/server/src/cloud/pinnedRuntime.test.tsapps/server/src/cloud/selfUpdate.test.tsapps/server/src/environment/ServerEnvironment.test.tsapps/server/src/environment/ServerEnvironment.tsapps/server/src/environment/ServerEnvironmentLabel.test.tsapps/server/src/git/GitManager.test.tsapps/server/src/git/GitManager.tsapps/server/src/http.test.tsapps/server/src/http.tsapps/server/src/processRunner.tsapps/server/src/project/ProjectFaviconResolver.test.tsapps/server/src/project/ProjectFaviconResolver.tsapps/server/src/provider/CodexDeveloperInstructions.tsapps/server/src/provider/opencodeRuntime.cliParsers.test.tsapps/server/src/provider/opencodeRuntime.tsapps/server/src/pullRequest/AzureDevOpsPullRequestCli.test.tsapps/server/src/pullRequest/AzureDevOpsPullRequestCli.tsapps/server/src/pullRequest/AzureDevOpsPullRequestProvider.test.tsapps/server/src/pullRequest/AzureDevOpsPullRequestProvider.tsapps/server/src/pullRequest/BitbucketPullRequestApi.test.tsapps/server/src/pullRequest/BitbucketPullRequestApi.tsapps/server/src/pullRequest/BitbucketPullRequestProvider.test.tsapps/server/src/pullRequest/BitbucketPullRequestProvider.tsapps/server/src/pullRequest/GitHubPullRequestCli.test.tsapps/server/src/pullRequest/GitHubPullRequestCli.tsapps/server/src/pullRequest/GitHubPullRequestProvider.test.tsapps/server/src/pullRequest/GitHubPullRequestProvider.tsapps/server/src/pullRequest/GitLabPullRequestCli.test.tsapps/server/src/pullRequest/GitLabPullRequestCli.tsapps/server/src/pullRequest/GitLabPullRequestProvider.test.tsapps/server/src/pullRequest/GitLabPullRequestProvider.tsapps/server/src/pullRequest/PullRequestProvider.tsapps/server/src/pullRequest/PullRequestProviderRegistry.tsapps/server/src/pullRequest/PullRequestService.test.tsapps/server/src/pullRequest/PullRequestService.tsapps/server/src/pullRequest/azureDevOpsPullRequestJson.test.tsapps/server/src/pullRequest/azureDevOpsPullRequestJson.tsapps/server/src/pullRequest/bitbucketPullRequestJson.test.tsapps/server/src/pullRequest/bitbucketPullRequestJson.tsapps/server/src/pullRequest/gitHubPullRequestJson.test.tsapps/server/src/pullRequest/gitHubPullRequestJson.tsapps/server/src/pullRequest/gitLabMergeRequestJson.test.tsapps/server/src/pullRequest/gitLabMergeRequestJson.tsapps/server/src/pullRequest/http.tsapps/server/src/resourceTelemetry/ResourceMonitorBinary.test.tsapps/server/src/resourceTelemetry/ResourceMonitorBinary.tsapps/server/src/server.test.tsapps/server/src/server.tsapps/server/src/sourceControl/BitbucketApi.test.tsapps/server/src/sourceControl/BitbucketApi.tsapps/server/src/sourceControl/GitHubCli.tsapps/server/src/sourceControl/GitLabCli.tsapps/server/src/sourceControl/SourceControlProviderRegistry.test.tsapps/server/src/sourceControl/SourceControlProviderRegistry.tsapps/server/src/sourceControl/azureDevOpsPullRequests.tsapps/server/src/stream/collectUint8StreamText.test.tsapps/server/src/stream/collectUint8StreamText.tsapps/server/src/terminal/NodePtyAdapter.test.tsapps/server/src/terminal/NodePtyAdapter.tsapps/server/src/usage/UsageService.tsapps/server/src/usage/usageAggregation.test.tsapps/server/src/usage/usageAggregation.tsapps/server/src/usage/usageScanCache.tsapps/server/src/usage/usageTranscripts.test.tsapps/server/src/usage/usageTranscripts.tsapps/server/src/vcs/GitVcsDriver.tsapps/server/src/vcs/GitVcsDriverCore.test.tsapps/server/src/vcs/GitVcsDriverCore.tsapps/server/src/vcs/VcsProcess.test.tsapps/server/src/vcs/VcsProcess.tsapps/server/src/ws.tsapps/web/index.htmlapps/web/package.jsonapps/web/src/components/AppSidebarLayout.tsxapps/web/src/components/BranchToolbar.tsxapps/web/src/components/BranchToolbarBranchSelector.tsxapps/web/src/components/BranchToolbarEnvModeSelector.tsxapps/web/src/components/BranchToolbarEnvironmentSelector.tsxapps/web/src/components/ChatMarkdown.tsxapps/web/src/components/ChatView.logic.tsapps/web/src/components/ChatView.tsxapps/web/src/components/CommandPalette.logic.test.tsapps/web/src/components/CommandPalette.tsxapps/web/src/components/ConfirmDialogHost.tsxapps/web/src/components/DiffPanel.tsxapps/web/src/components/GitActionsControl.tsxapps/web/src/components/LegacySidebar.tsxapps/web/src/components/RightPanelTabs.tsxapps/web/src/components/Sidebar.logic.test.tsapps/web/src/components/Sidebar.logic.tsapps/web/src/components/Sidebar.snooze.test.tsapps/web/src/components/Sidebar.tsxapps/web/src/components/SidebarStageBackdrop.test.tsxapps/web/src/components/SidebarStageBackdrop.tsxapps/web/src/components/WorkspaceBreadcrumb.tsxapps/web/src/components/chat/ChatComposer.tsxapps/web/src/components/chat/ChatHeader.tsxapps/web/src/components/chat/ComposerPrimaryActions.test.tsapps/web/src/components/chat/ComposerPrimaryActions.tsxapps/web/src/components/chat/DraftHeroHeadline.tsxapps/web/src/components/chat/MessagesTimeline.tsxapps/web/src/components/chat/ModelPickerSidebar.tsxapps/web/src/components/chat/PanelLayoutControls.tsxapps/web/src/components/chat/ThreadErrorBanner.test.tsxapps/web/src/components/chat/ThreadErrorBanner.tsxapps/web/src/components/chat/TraitsPicker.tsxapps/web/src/components/clerk/MobileClientsUserProfilePage.tsxapps/web/src/components/clerk/authRedirect.test.tsapps/web/src/components/clerk/authRedirect.tsapps/web/src/components/diffs/AnnotatableCodeView.test.tsxapps/web/src/components/diffs/AnnotatableCodeView.tsxapps/web/src/components/diffs/DiffCommentAnnotation.test.tsxapps/web/src/components/diffs/DiffCommentAnnotation.tsxapps/web/src/components/diffs/StyledDiffCodeView.test.tsxapps/web/src/components/diffs/StyledDiffCodeView.tsxapps/web/src/components/diffs/commentSubmitShortcut.test.tsapps/web/src/components/diffs/commentSubmitShortcut.tsapps/web/src/components/files/FilePreviewPanel.tsxapps/web/src/components/preview/PreviewPanelShell.tsxapps/web/src/components/pullRequest/PullRequestActivityUnavailableState.tsxapps/web/src/components/pullRequest/PullRequestCodeTab.tsxapps/web/src/components/pullRequest/PullRequestDetailPanel.tsxapps/web/src/components/pullRequest/PullRequestGhosts.tsxapps/web/src/components/pullRequest/PullRequestListEmptyState.test.tsxapps/web/src/components/pullRequest/PullRequestListEmptyState.tsxapps/web/src/components/pullRequest/PullRequestListFilters.test.tsxapps/web/src/components/pullRequest/PullRequestListFilters.tsxapps/web/src/components/pullRequest/PullRequestMarkdown.tsxapps/web/src/components/pullRequest/PullRequestReviewAnnotation.tsxapps/web/src/components/pullRequest/PullRequestReviewBar.tsxapps/web/src/components/pullRequest/PullRequestReviewerPicker.tsxapps/web/src/components/pullRequest/PullRequestRow.tsxapps/web/src/components/pullRequest/PullRequestSummaryTab.tsxapps/web/src/components/pullRequest/PullRequestTimelineTab.tsxapps/web/src/components/pullRequest/PullRequestsUnavailableState.test.tsxapps/web/src/components/pullRequest/PullRequestsUnavailableState.tsxapps/web/src/components/pullRequest/pullRequestDetail.logic.test.tsapps/web/src/components/pullRequest/pullRequestDetail.logic.tsapps/web/src/components/pullRequest/pullRequestDiff.logic.test.tsapps/web/src/components/pullRequest/pullRequestDiff.logic.tsapps/web/src/components/pullRequest/pullRequestList.logic.test.tsapps/web/src/components/pullRequest/pullRequestList.logic.tsapps/web/src/components/pullRequest/pullRequestMarkdown.logic.test.tsapps/web/src/components/pullRequest/pullRequestMarkdown.logic.tsapps/web/src/components/pullRequest/pullRequestPresentation.tsxapps/web/src/components/pullRequest/pullRequestReviewStore.test.tsapps/web/src/components/pullRequest/pullRequestReviewStore.tsapps/web/src/components/settings/DiagnosticsSettings.tsxapps/web/src/components/settings/ProjectSettingsPanel.tsxapps/web/src/components/settings/ProviderInstanceCard.tsxapps/web/src/components/settings/ResourceTelemetryDiagnostics.tsxapps/web/src/components/settings/SettingsBreadcrumb.tsxapps/web/src/components/settings/SettingsPanels.logic.test.tsapps/web/src/components/settings/SettingsPanels.logic.tsapps/web/src/components/settings/SettingsPanels.tsxapps/web/src/components/settings/SettingsSidebarNav.tsxapps/web/src/components/settings/ThemeColorPicker.tsxapps/web/src/components/settings/ThemeEditorPanel.tsxapps/web/src/components/settings/ThemeImportDialog.tsxapps/web/src/components/settings/ThemeSearchSection.tsxapps/web/src/components/settings/ThemeSettings.tsxapps/web/src/components/settings/settingsLayout.tsxapps/web/src/components/settings/settingsSearch.test.tsapps/web/src/components/settings/settingsSearch.tsapps/web/src/components/settings/themeInspector.test.tsapps/web/src/components/settings/themeInspector.tsapps/web/src/components/sidebar/SidebarChrome.tsxapps/web/src/components/sidebar/SidebarProviderUpdatePill.tsxapps/web/src/components/sidebar/SidebarUpdatePill.tsxapps/web/src/components/threadActionMenu.logic.test.tsapps/web/src/components/threadActionMenu.logic.tsapps/web/src/components/threadSidebarWidth.test.tsapps/web/src/components/ui/autocomplete.tsxapps/web/src/components/ui/combobox.tsxapps/web/src/components/ui/menu.tsxapps/web/src/components/ui/popover.tsxapps/web/src/components/ui/select.tsxapps/web/src/components/ui/skeleton.tsxapps/web/src/components/usage/UsagePage.tsxapps/web/src/components/usage/UsageProviderChart.test.tsapps/web/src/components/usage/UsageProviderChart.tsxapps/web/src/confirmDialog.test.tsapps/web/src/confirmDialog.tsapps/web/src/connection/runtime.tsapps/web/src/hooks/useHandleNewThread.tsapps/web/src/hooks/useLiveRefresh.test.tsapps/web/src/hooks/useLiveRefresh.tsapps/web/src/hooks/useSettings.tsapps/web/src/hooks/useThreadActionMenu.tsapps/web/src/hooks/useThreadActions.tsapps/web/src/index.cssapps/web/src/lib/chatThreadActions.tsapps/web/src/lib/diffFileContents.test.tsapps/web/src/lib/diffFileContents.tsapps/web/src/lib/diffRendering.tsapps/web/src/lib/imageCompression.tsapps/web/src/lib/openPullRequestLink.test.tsapps/web/src/lib/openPullRequestLink.tsapps/web/src/localApi.test.tsapps/web/src/localApi.tsapps/web/src/markdown-github-alerts.test.tsxapps/web/src/markdown-github-alerts.tsapps/web/src/openVsxThemes.test.tsapps/web/src/openVsxThemes.tsapps/web/src/reviewCommentContext.test.tsapps/web/src/reviewCommentContext.tsapps/web/src/rightPanelStore.test.tsapps/web/src/rightPanelStore.tsapps/web/src/routeTree.gen.tsapps/web/src/routes/__root.tsxapps/web/src/routes/_chat.index.tsxapps/web/src/routes/_chat.pull-requests.tsxapps/web/src/routes/projects.$projectKey.tsxapps/web/src/routes/settings.projects.tsxapps/web/src/routes/settings.projects_.$projectKey.tsxapps/web/src/routes/settings.tsxapps/web/src/sourceControlPresentation.tsapps/web/src/state/pullRequests.tsapps/web/src/state/queries.tsapps/web/src/state/usage.tsapps/web/src/themeBoot.test.tsapps/web/src/themePalette.test.tsapps/web/src/themePalette.tsapps/web/src/vscodeThemeImport.test.tsapps/web/src/vscodeThemeImport.tsdocs/README.mddocs/user/remote-access.mddocs/user/source-control.mddocs/user/thread-sidebar.mddocs/user/usage.mdpackages/client-runtime/package.jsonpackages/client-runtime/src/rpc/http.tspackages/client-runtime/src/state/projectGrouping.test.tspackages/client-runtime/src/state/projectGrouping.tspackages/client-runtime/src/state/pullRequestDiffHttp.test.tspackages/client-runtime/src/state/pullRequestDiffHttp.tspackages/client-runtime/src/state/pullRequests.tspackages/client-runtime/src/state/runtime.tspackages/client-runtime/src/state/threadSettled.tspackages/client-runtime/src/state/threadSnoozed.test.tspackages/contracts/package.jsonpackages/contracts/src/environment.test.tspackages/contracts/src/environment.tspackages/contracts/src/environmentHttp.tspackages/contracts/src/git.tspackages/contracts/src/index.tspackages/contracts/src/ipc.tspackages/contracts/src/pullRequest.test.tspackages/contracts/src/pullRequest.tspackages/contracts/src/rpc.tspackages/contracts/src/usage.tspackages/shared/src/composerInlineTokens.test.tspackages/shared/src/composerInlineTokens.tspackages/shared/src/path.test.tspackages/shared/src/path.tspackages/shared/src/shell.test.tspackages/shared/src/shell.tspackages/shared/src/sourceControl.test.tspackages/shared/src/sourceControl.tspackages/shared/src/usageFormat.test.tspackages/shared/src/usageFormat.tspackages/shared/src/usageMerge.test.tspackages/shared/src/usageMerge.tspatches/@clerk__expo@4.2.0.patchpatches/@legendapp__list@3.3.5.patchpatches/@react-native-menu__menu@2.0.0.patchpatches/react-native-screens@4.25.2.patchpnpm-lock.yamlpnpm-workspace.yamlvite.config.tsUnmerged paths reported by Git
docs/README.mdRebase error
Review and retry
repair/turbo-nightly-31691215033from the unchangedturbobranch.turbo.mainbefore retrying. Do not hand-edit the upstream checkpoint or publish partial artifacts.gh workflow run turbo-nightly-sync.yml -R gfsaaser24/t3code --ref main