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 |
---|
/AWB/Main.cs | 2 | 0 | 16 | 0 | -- | 0 | SM |
/UnitTests/MiscellaneousTests.cs | 3 | 3 | 12 | 12 | -- | 0 | SM |
/AWB/Main.Designer.cs | 2 | 2 | 31 | 31 | -- | 0 | SM |
/WikiFunctions/WikiRegexes.cs | 1 | 1 | 8 | 2 | -- | 0 | SM |
/WikiFunctions/TalkPageHeaders.cs | 1 | 1 | 4 | 4 | -- | 0 | SM |
/WikiFunctions/Controls/Lists/ListMaker.cs | 0 | 1 | 0 | 40 | -- | 0 | UM |
/WikiFunctions/Parse/Parsers.cs | 3 | 3 | 88 | 214 | -- | 0 | UM |