From 3adaa5e534d3c913ac9f5b7bcd779034f06016f7 Mon Sep 17 00:00:00 2001 From: FourWindff Date: Mon, 25 May 2026 12:34:32 +0800 Subject: [PATCH] fix(task-title-bar): show merge target branch --- src/components/TaskTitleBar.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/TaskTitleBar.tsx b/src/components/TaskTitleBar.tsx index e21147cc..8a327ab4 100644 --- a/src/components/TaskTitleBar.tsx +++ b/src/components/TaskTitleBar.tsx @@ -30,6 +30,10 @@ interface TaskTitleBarProps { onTitleEditRef: (h: EditableTextHandle) => void; } +function getMergeButtonTitle(task: Pick): string { + return `Merge into ${task.baseBranch ?? 'main'}`; +} + export function TaskTitleBar(props: TaskTitleBarProps) { const dockerBadgeLabel = () => getTaskDockerBadgeLabel(props.task.dockerSource); const titleLabel = () => { @@ -126,7 +130,7 @@ export function TaskTitleBar(props: TaskTitleBarProps) { } onClick={() => props.onMerge()} - title="Merge into main" + title={getMergeButtonTitle(props.task)} />