penpot

mirror of https://github.com/penpot/penpot.git synced 2026-10-29 22:10:34 +00:00

History

Álvaro Tejero Cantero 6e3acf7482

♻️ Delete every merged branch, as penpot#12596 decided

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

2026-10-28 12:27:38 +01:00

dev

🐛 Fix the open defects of the branching tech preview

2026-10-06 10:36:55 +02:00

resources

Merge branch 'juan-vc-ui-tweaks-01' into iop-vc-preview

2026-10-28 12:06:11 +01:00

scripts

Merge remote-tracking branch 'origin/develop' into iop-vc-preview

2026-10-28 06:28:08 +01:00

src

♻️ Delete every merged branch, as penpot#12596 decided