mirror of
https://github.com/penpot/penpot.git
synced 2026-10-29 14:00:37 +00:00
6e3acf7482
The merge into iop-vc-preview kept the "Archive this branch" option of the later merge dialog. Juan's decision in penpot#12596 holds instead: a merged branch is always deleted, never archived. The merge and conflict dialogs lose the option, merge-file-branch no longer takes keep-branch, merged branches leave the branch list and count again, and the tests for kept merged branches go, as in the pull request. The merge comment stays. The warning about left-out changes no longer suggests archiving. AI-assisted-by: claude-opus-5-5