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/publishers/RssPublisher.cs | 9 | 5 | 225 | 120 | -- | 0 | SM |
/project/core/configuration/NetReflectorConfigurationReader.cs | 6 | 5 | 25 | 20 | -- | 0 | SM |
/project/core/Project.cs | 4 | 2 | 110 | 24 | -- | 1 | SM |
/project/WebDashboard/Dashboard/VelocityProjectGridAction.cs | 4 | 2 | 54 | 50 | -- | 0 | SM |
/project/WebDashboard/Dashboard/SideBarViewBuilder.cs | 3 | 2 | 220 | 110 | -- | 0 | SM |
/project/WebDashboard/Plugins/FarmReport/FarmReportFarmPlugin.cs | 3 | 1 | 43 | 4 | -- | 0 | SM |
/project/console/ConsoleMain.cs | 2 | 1 | 87 | 80 | -- | 0 | SM |
/project/WebDashboard/Plugins/ServerReport/ServerReportServerPlugin.cs | 2 | 1 | 7 | 4 | -- | 0 | SM |
/project/Remote/ICruiseServer.cs | 2 | 0 | 28 | 0 | -- | 0 | SM |
/project/WebDashboard/ServerConnection/ServerAggregatingCruiseManagerWrapper.cs | 1 | 0 | 100 | 0 | -- | 0 | SM |
/project/core/CruiseManager.cs | 1 | 0 | 68 | 0 | -- | 0 | SM |
/project/core/RemoteCruiseServer.cs | 1 | 0 | 46 | 0 | -- | 0 | SM |
/project/WebDashboard/Configuration/NetReflectorPluginConfiguration.cs | 1 | 0 | 22 | 0 | -- | 0 | SM |
/project/core/configuration/IConfigurationValidation.cs | 1 | 0 | 16 | 0 | -- | 0 | SM |
/project/core/util/SystemIoFileSystem.cs | 1 | 0 | 15 | 0 | -- | 0 | SM |
/project/WebDashboard/ServerConnection/IFarmService.cs | 1 | 0 | 14 | 0 | -- | 0 | SM |
/project/Remote/ICruiseManager.cs | 1 | 0 | 14 | 0 | -- | 0 | SM |
/project/WebDashboard/Dashboard/IProjectGridAction.cs | 1 | 0 | 12 | 0 | -- | 0 | SM |
/project/core/IProject.cs | 1 | 0 | 9 | 0 | -- | 0 | SM |
/project/core/configuration/Configuration.cs | 1 | 0 | 8 | 0 | -- | 0 | SM |
/project/core/Workflow.cs | 1 | 0 | 6 | 0 | -- | 0 | SM |
/project/core/util/IFileSystem.cs | 1 | 0 | 3 | 0 | -- | 0 | SM |
/project/WebDashboard/Configuration/IPluginConfiguration.cs | 1 | 0 | 3 | 0 | -- | 0 | SM |
/project/UnitTests/Core/CruiseServerTest.cs | 3 | 3 | 17 | 17 | -- | 0 | SM |
/project/core/CruiseServerFactory.cs | 2 | 2 | 10 | 10 | -- | 0 | SM |
/project/core/sourcecontrol/DefaultIssueTrackerUrlBuilder.cs | 2 | 2 | 9 | 9 | -- | 0 | SM |
/project/UnitTests/Core/Publishers/PackagePublisherTests.cs | 1 | 1 | 535 | 49 | -- | 0 | SM |
/project/core/util/StringUtil.cs | 1 | 1 | 352 | 36 | -- | 0 | SM |
/project/core/label/AssemblyVersionLabeller.cs | 1 | 1 | 145 | 95 | -- | 0 | SM |
/project/service/AppRunner.cs | 1 | 1 | 183 | 28 | -- | 0 | SM |
/project/core/ProjectIntegrator.cs | 1 | 1 | 109 | 101 | -- | 0 | SM |
/project/console/AppRunner.cs | 1 | 1 | 114 | 32 | -- | 0 | SM |
/project/core/sourcecontrol/Svn.cs | 1 | 1 | 22 | 22 | -- | 0 | SM |
/project/WebDashboard/Plugins/ProjectReport/ProjectReportProjectPlugin.cs | 1 | 1 | 22 | 22 | -- | 0 | SM |
/project/UnitTests/Core/Config/NetReflectorConfigurationReaderTest.cs | 1 | 1 | 26 | 8 | -- | 0 | SM |
/project/Validator/MainForm.cs | 1 | 2 | 66 | 110 | -- | 0 | UM |
/project/service/CCService.cs | 4 | 6 | 164 | 91 | -- | 0 | UM |
/project/core/CruiseServer.cs | 5 | 11 | 767 | 108 | -- | 0 | UM |