mirror of
https://github.com/penpot/penpot.git
synced 2026-10-29 05:50:35 +00:00
d613972474
A branch whose only change was file-level plugin data or the base font size merged with a success response, and the change was lost. The merge engine compared colours, typographies, components, media, pages, and tokens only, so such a branch produced an empty summary and the merge took the empty-changes shortcut. The engine now classifies two more kinds three-way: file plugin data, flattened to namespace and key as page plugin data already is, and the file options, where an unset base font size reads as the default. Both kinds count towards ahead, behind, and conflicts, appear in the compare dialog, and translate into set-plugin-data and set-base-font-size changes for merge and update from main. Both sides changing the same key to different values is a modify-modify conflict. AI-assisted-by: claude-opus-5-5 Signed-off-by: Álvaro Tejero Cantero <alvorithm@teje.ro>