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 |
---|
/WikiFunctions/Parse/Parsers.cs | 5 | 4 | 290 | 323 | -- | 0 | SM |
/WikiFunctions/Tools.cs | 5 | 4 | 100 | 48 | -- | 1 | SM |
/AWB/Main.cs | 5 | 3 | 30 | 14 | -- | 0 | SM |
/UnitTests/MiscellaneousTests.cs | 1 | 0 | 44 | 0 | -- | 0 | SM |
/AWB/ArticleEX.cs | 1 | 0 | 38 | 0 | -- | 0 | SM |
/WikiFunctions/WikiRegexes.cs | 1 | 1 | 8 | 8 | -- | 0 | SM |
/WikiFunctions/Controls/Lists/ListMaker.cs | 0 | 1 | 0 | 40 | -- | 0 | UM |