Results of semistructured (SM) and unstructured merge (UM) in revision : conflicts (C), conflicting lines of code (CL) and semantic conflicts (SC).
Yellow boxes indicate better results of unstructured merge. CM column dislays which kind is selected for combined conflict merge.
| C | CL | SC | CM |
---|
File | UM | SM | UM | SM | UM | SM |
---|
/UnitTests/MiscellaneousTests.cs | 2 | 1 | 80 | 20 | -- | 0 | SM |
/WikiFunctions/TalkPageHeaders.cs | 1 | 0 | 1 | 0 | -- | 0 | SM |
/UnitTests/RegexTests.cs | 1 | 1 | 42 | 26 | -- | 0 | SM |
/WikiFunctions/Controls/Lists/ListBox2.cs | 1 | 1 | 40 | 26 | -- | 0 | SM |
/WikiFunctions/Controls/Lists/ListMaker.cs | 0 | 1 | 0 | 40 | -- | 0 | UM |
/WikiFunctions/Tools.cs | 1 | 1 | 4 | 28 | -- | 0 | UM |