mirror of
https://github.com/penpot/penpot.git
synced 2026-10-29 14:00:37 +00:00
74e33d05b6
Takes penpot#12596: branch access by team role alone (no file role on a branch, the owner role on materialise, branches move with their source file, migrations 0807 and 0808), the merge record with its comment (migration 0806) and the reviews dialog, the new git icons, and the workspace tidy-up. Where Juan's later redesign of the compare, conflict and merge dialogs (c68daed816, e4e237346e) already changed the same code, the redesign wins: the old dialogs stay in branch_review/, the redrawn compare icon stays, and the merge keeps its "Archive this branch" option. So merge-file-branch accepts both `comment` and `keep-branch`, a kept merged branch is listed and counted again, and the keep-branch tests the PR removed are restored. The merge dialog asks for the comment beside the archive option, and the conflicts dialog sends it on. AI-assisted-by: claude-opus-5-5