Skip to content

fix(web): keep the semantic branch-naming note inside its settings row #17107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Melv1C wants to merge 2 commits into from
Closed

fix(web): keep the semantic branch-naming note inside its settings row #17107

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
312bbda
fix(web): keep the semantic branch-naming note inside its settings row
Melv1C Oct 8, 2026
0389a0a
fix(web): keep the semantic branch-naming note readable when the row …
Melv1C Oct 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions apps/web/src/components/settings/BranchNamingSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,17 @@ export function BranchNamingSettings() {
serverScoped
settingKeys={["branchNamingMode"]}
{...searchableSetting("worktree-branch-naming")}
description="Choose how new worktree branches are named from your first message."
description={
<>
Choose how new worktree branches are named from your first message.
{!modeMixed && settings.branchNamingMode === "semantic" ? (
<span className="mt-1 block text-pretty">
The model chooses a prefix that describes the work, such as feat/add-search,
fix/login-timeout, or refactor/auth.
</span>
) : null}
</>
}
resetAction={
settings.branchNamingMode !== DEFAULT_SERVER_SETTINGS.branchNamingMode || modeMixed ? (
<SettingResetButton
Expand Down Expand Up @@ -109,12 +119,6 @@ export function BranchNamingSettings() {
}
/>
) : null}
{!modeMixed && settings.branchNamingMode === "semantic" ? (
<p className="pb-3 text-sm text-muted-foreground">
The model chooses a prefix that describes the work, such as feat/add-search,
fix/login-timeout, or refactor/auth.
</p>
) : null}
{!modeMixed && settings.branchNamingMode === "custom" ? (
<SettingsRow
serverScoped
Expand Down
Loading