
Merge Conflict - Nested Markers From a Conflicted Resolution
Someone committed a file that still contained conflict markers, and merging that commit produced markers inside markers. Region matchers that pair the first `<<<<<<<` with the first `=======` split this file in the wrong place and produce two overlapping regions that cannot both be resolved.
- File
- TXT · Merges · UTF-8
- Use case
- Error handlingVisual diff / regression+1






















