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 | 3 | 2 | 433 | 33 | -- | 0 | SM |
/project/WebDashboard/Dashboard/SideBarViewBuilder.cs | 3 | 2 | 220 | 110 | -- | 0 | SM |
/project/core/Project.cs | 3 | 1 | 54 | 10 | -- | 0 | SM |
/project/WebDashboard/Configuration/NetReflectorPluginConfiguration.cs | 1 | 0 | 22 | 0 | -- | 0 | SM |
/project/UnitTests/Core/Publishers/RSSPublisherTest.cs | 1 | 0 | 18 | 0 | -- | 0 | SM |
/project/UnitTests/Core/Config/NetReflectorConfigurationReaderTest.cs | 1 | 0 | 10 | 0 | -- | 0 | SM |
/project/core/Workflow.cs | 1 | 0 | 6 | 0 | -- | 0 | SM |
/project/core/IProject.cs | 1 | 0 | 5 | 0 | -- | 0 | SM |
/project/WebDashboard/Configuration/IPluginConfiguration.cs | 1 | 0 | 3 | 0 | -- | 0 | SM |
/project/core/configuration/NetReflectorConfigurationReader.cs | 1 | 0 | 2 | 0 | -- | 0 | SM |
/project/core/sourcecontrol/Svn.cs | 2 | 2 | 17 | 17 | -- | 0 | SM |
/project/console/ConsoleMain.cs | 1 | 1 | 51 | 51 | -- | 0 | SM |
/project/WebDashboard/Plugins/ProjectReport/ProjectReportProjectPlugin.cs | 1 | 1 | 22 | 22 | -- | 0 | SM |
/project/UnitTests/Core/CruiseServerTest.cs | 1 | 1 | 6 | 6 | -- | 0 | SM |