mirror of
https://github.com/penpot/penpot.git
synced 2026-10-29 14:00:37 +00:00
6259f2b375
The modal rebuilt its conflict list from a diff fetched separately, which is computed in another id frame than the one the update command resolves against, so an update could open a resolver showing 0 of 0 with an Apply that could never enable. The conflicts a command returns are authoritative, because they are what its own resolved? matches against: the modal now prefers them, keeps them in the store, and the bulk actions resolve that same set. Verified in a browser against preview-demo-loud without applying: 0 of 368 resolved with Apply disabled, then 368 of 368 with Apply enabled after Use main for all. Main stayed at revn 28453 and the branch row did not move.