mirror of
https://github.com/penpot/penpot.git
synced 2026-10-29 14:00:37 +00:00
8a3330f781
A branch copy re-points its local references through the duplication pipeline and leaves keys like :fill-color-ref-file and :typography-ref-file present with nil where the source omitted them. Comparing the two forms as different made an untouched entity look edited on one side, which becomes a modify-modify conflict as soon as the other side moves the same shape. The comparison now drops nil-valued keys deeply, for all three sides, in three-way-entities and so for every pass that goes through it. The new engine test failed before the change on both orderings and passes after; the three branch suites report 30 tests, 245 assertions, 0 failures.