salto-io / salto / e911976e-ff5a-45ac-94d3-d10ab6740d77 / 17

94%

master: 94%

push

circleci

SALTO-7200: Fix merge errors not updating when resolved (#7086)

* SALTO-7200: Fix merge errors not updating when resolved

When the same value is defined twice on an element, it will have merge errors
When that issue is resolved and there are no merge errors anymore, the cache would not be updated to reflect that.

Fixing this by letting the merge errors be updated even if the element isn't changed

1142 of 1240 branches covered (92.1%)

Branch coverage included in aggregate %.

3804 of 3934 relevant lines covered (96.7%)

129.97 hits per line