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 | 25 | 24 | 608 | 742 | -- | 0 | SM |
/WikiFunctions/Tools.cs | 6 | 5 | 78 | 50 | -- | 0 | SM |
/WikiFunctions/Parse/MetaDataSorter.cs | 6 | 2 | 102 | 117 | -- | 1 | SM |
/WikiFunctions/API/PageInfo.cs | 1 | 0 | 36 | 0 | -- | 0 | SM |
/WikiFunctions/Article/Article.cs | 1 | 0 | 14 | 0 | -- | 0 | SM |
/UnitTests/RegexTests.cs | 1 | 0 | 5 | 0 | -- | 0 | SM |
/WikiFunctions/Properties/AssemblyInfo.cs | 1 | 0 | 4 | 0 | -- | 0 | SM |
/AWB/Properties/AssemblyInfo.cs | 1 | 0 | 4 | 0 | -- | 0 | SM |
/WikiFunctions/WikiRegexes.cs | 7 | 7 | 28 | 14 | -- | 0 | SM |
/WikiFunctions/Session.cs | 1 | 1 | 6 | 6 | -- | 0 | SM |
/WikiFunctions/Controls/Lists/ListMaker.cs | 0 | 1 | 0 | 40 | -- | 0 | UM |