From 5e9238f7731852adeff37aa30ea5c89fe1d3d0f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Tejero=20Cantero?= Date: Wed, 28 Oct 2026 12:29:36 +0100 Subject: [PATCH] :books: Say in confirm-merge! that a merge deletes the branch The docstring still offered to keep the branch archived, which the merge dialog no longer does. AI-assisted-by: claude-opus-5-5 --- .../main/ui/workspace/sidebar/branch_review/common.cljs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/sidebar/branch_review/common.cljs b/frontend/src/app/main/ui/workspace/sidebar/branch_review/common.cljs index 4d4c5b979f..9af1224186 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/branch_review/common.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/branch_review/common.cljs @@ -24,10 +24,10 @@ ;; --- Merge / update confirmations (defn confirm-merge! - "Open the merge dialog for `branch` (merge into main is irreversible; the - dialog asks for a comment for the merge's record and lets the user choose - whether to keep the branch archived). `excluded` is the compare dialog's - per-change selection, if any." + "Open the merge dialog for `branch` (merge into main is irreversible and + deletes the branch; the dialog asks for a comment for the merge's + record). `excluded` is the compare dialog's per-change selection, if + any." ([branch] (confirm-merge! branch nil)) ([branch excluded] (modal/show! :merge-branch {:branch branch :excluded excluded})))