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/MetaDataSorter.cs | 8 | 3 | 149 | 135 | -- | 0 | SM |
/AWB/Main.cs | 6 | 3 | 77 | 58 | -- | 0 | SM |
/WikiFunctions/Article/Article.cs | 2 | 0 | 38 | 0 | -- | 0 | SM |
/UnitTests/MiscellaneousTests.cs | 1 | 0 | 50 | 0 | -- | 0 | SM |
/AWB/PluginManager.cs | 1 | 1 | 74 | 66 | -- | 0 | SM |
/WikiFunctions/ErrorHandler.cs | 1 | 1 | 20 | 20 | -- | 0 | SM |
/UnitTests/DynamicRegexTests.cs | 1 | 1 | 6 | 6 | -- | 0 | SM |
/WikiFunctions/Controls/Lists/ListMaker.cs | 0 | 1 | 0 | 40 | -- | 0 | UM |
/WikiFunctions/TalkPageHeaders.cs | 2 | 2 | 62 | 107 | -- | 0 | UM |
/UnitTests/RegexTests.cs | 4 | 5 | 99 | 53 | -- | 0 | UM |
/WikiFunctions/Parse/Parsers.cs | 5 | 7 | 104 | 100 | -- | 0 | UM |
/WikiFunctions/WikiRegexes.cs | 7 | 8 | 63 | 59 | -- | 0 | UM |
/WikiFunctions/Tools.cs | 10 | 13 | 297 | 131 | -- | 0 | UM |