mirror of
https://github.com/penpot/penpot.git
synced 2026-10-29 14:00:37 +00:00
95ad841ed5
The merge summary now says, for each component whose main the incoming side changed, which copies will follow it after the integration and which keep an override, per sync group and token slot. Each copy entry lists what the copy rule settled, with the side and the reason, and what the user still decides. A copy the rule settles entirely stays in the summary as an informational entry instead of disappearing, and applies nothing. A conflict on a component's main counts the copies its resolution also decides. AI-assisted-by: claude-opus-5-5