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 | 4 | 1 | 111 | 5 | -- | 0 | SM |
/WikiFunctions/WikiRegexes.cs | 3 | 2 | 21 | 4 | -- | 0 | SM |
/WikiFunctions/Tools.cs | 2 | 1 | 16 | 28 | -- | 0 | SM |
/AWB/Main.Designer.cs | 2 | 1 | 4 | 1 | -- | 0 | SM |
/AWB/Main.cs | 4 | 4 | 29 | 29 | -- | 0 | SM |
/UnitTests/RegexTests.cs | 1 | 1 | 43 | 25 | -- | 0 | SM |
/WikiFunctions/Lists/Providers/NonMWListProviders.cs | 1 | 1 | 2 | 2 | -- | 0 | SM |
/WikiFunctions/Controls/Lists/ListMaker.cs | 0 | 1 | 0 | 40 | -- | 0 | UM |
/WikiFunctions/Parse/Parsers.cs | 2 | 3 | 364 | 92 | -- | 0 | UM |