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 |
---|
/project/core/CruiseServer.cs | 2 | 1 | 132 | 12 | -- | 0 | SM |
/project/core/Project.cs | 1 | 0 | 44 | 0 | -- | 0 | SM |
/project/WebDashboard/Configuration/NetReflectorPluginConfiguration.cs | 1 | 0 | 22 | 0 | -- | 0 | SM |
/project/UnitTests/Core/Config/NetReflectorConfigurationReaderTest.cs | 1 | 0 | 4 | 0 | -- | 0 | SM |
/project/WebDashboard/Configuration/IPluginConfiguration.cs | 1 | 0 | 3 | 0 | -- | 0 | SM |
/project/CCTrayLib/StatusIcon.cs | 1 | 1 | 39 | 39 | -- | 0 | SM |
/project/core/IntegrationQueueManager.cs | 1 | 1 | 7 | 7 | -- | 0 | SM |
/project/UnitTests/Core/CruiseServerTest.cs | 1 | 1 | 5 | 5 | -- | 0 | SM |