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 | 6 | 5 | 63 | 23 | -- | 0 | SM |
/WikiFunctions/Parse/MetaDataSorter.cs | 3 | 1 | 62 | 48 | -- | 0 | SM |
/WikiFunctions/WikiRegexes.cs | 2 | 0 | 13 | 0 | -- | 0 | SM |
/WikiFunctions/DBScanner/DatabaseScanner.Designer.cs | 1 | 1 | 14 | 14 | -- | 0 | SM |
/WikiFunctions/DBScanner/DatabaseScanner.cs | 0 | 1 | 0 | 47 | -- | 0 | UM |