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/sourcecontrol/Mks.cs | 5 | 4 | 66 | 54 | -- | 0 | SM |
/project/core/util/ProcessExecutor.cs | 5 | 1 | 39 | 36 | -- | 0 | SM |
/project/core/CruiseServer.cs | 3 | 1 | 124 | 2 | -- | 0 | SM |
/project/core/tasks/BaseExecutableTask.cs | 2 | 1 | 94 | 22 | -- | 0 | SM |
/project/WebDashboard/Dashboard/BuildRequestTransformer.cs | 2 | 1 | 61 | 6 | -- | 0 | SM |
/project/UnitTests/Core/SourceControl/MksTest.cs | 3 | 0 | 17 | 0 | -- | 0 | SM |
/project/core/tasks/ExecutableTask.cs | 2 | 0 | 13 | 0 | -- | 0 | SM |
/project/core/tasks/SynchronisationTask.cs | 1 | 0 | 186 | 0 | -- | 1 | SM |
/project/UnitTests/Core/SourceControl/MksHistoryParserTest.cs | 1 | 0 | 38 | 0 | -- | 0 | SM |
/project/core/util/SystemIoFileSystem.cs | 1 | 0 | 16 | 0 | -- | 0 | SM |
/project/UnitTests/Core/SourceControl/Mercurial/MercurialTest.cs | 1 | 0 | 13 | 0 | -- | 0 | SM |
/project/UnitTests/Core/Tasks/TaskBaseTests.cs | 1 | 0 | 11 | 0 | -- | 0 | SM |
/project/core/util/IFileSystem.cs | 1 | 0 | 5 | 0 | -- | 0 | SM |
/project/core/IIntegrationRunnerTarget.cs | 1 | 0 | 3 | 0 | -- | 0 | SM |
/project/core/sourcecontrol/MksHistoryParser.cs | 2 | 2 | 129 | 117 | -- | 0 | SM |
/project/core/util/LdapHelper.cs | 1 | 1 | 203 | 34 | -- | 0 | SM |
/project/core/IntegrationRunner.cs | 1 | 1 | 4 | 4 | -- | 0 | SM |
/project/core/util/Options.cs | 0 | 2 | 0 | 10 | -- | 0 | UM |
/project/core/Project.cs | 1 | 1 | 16 | 55 | -- | 0 | UM |