feat(merge): Cover more cases for ordered merge#6

Merged

jpedroh merged 2 commits intomainfrom draft/recursing-napier

Oct 27, 2023

+271-11

Commits on Oct 27, 2023

feat(merge): Add check for when a parent removes a node that could have been modified in another parent
jpedroh
committed
test: Add a test to assert expected behaviour
jpedroh
committed