github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-10-29 05:50:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

📚 Say in confirm-merge! that a merge deletes the branch

Browse Source 
The docstring still offered to keep the branch archived, which the merge
dialog no longer does.

AI-assisted-by: claude-opus-5-5
This commit is contained in:
Álvaro Tejero Cantero 2026-10-28 12:29:36 +01:00
parent 6e3acf7482
commit 5e9238f773
No known key found for this signature in database
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/app/main/ui/workspace/sidebar/branch_review/common.cljs
View File

@ -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})))