search

sageserpent-open / kineticMerge

Merge a heavily refactored codebase and stay sane.
MIT License
12 stars 2 forks source link

Broaden support for edit and deletion propagation through moves. #28

Open sageserpent-open opened 8 months ago

sageserpent-open commented 8 months ago

This follows on from #13, expanding support for more complex forms of edit and deletion propagation.

It's really about going through MergeResultDetectingMotion and filling out all of the catch-all cases, eg. what happens when a section is moved between two sections that are edits of a moved section, etc...

sageserpent-open commented 7 months ago

Should go back and review #37, as this featured a move source in apparent conflict with a move destination within a coalescence of two left-delete versus right edit conflicts and a following right insertion.