mirror of
https://github.com/penpot/penpot.git
synced 2026-11-18 16:12:24 +00:00
Conflicts resolved as in git-cascade candidate ab64912569, with the design review migrations 0809 to 0814 kept after develop's 0158 and 0159. Fixes for develop's changes that merged without conflict: - files_branch.clj reads main FOR UPDATE: develop's get-file* refuses :lock-for-share? on a data read. - sidebar.cljs passes the scroll-store prop in review mode: develop removed the local scroll-store* atom. - The snapshot rename guard tests pass :file-id, now required by update-file-snapshot, and the branch import test expects develop's :not-supported refusal of every in-place import. AI-assisted-by: claude-opus-5-5 Signed-off-by: Álvaro Tejero Cantero <alvorithm@teje.ro>