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/CCTrayLib/Monitoring/RemotingCruiseProjectManager.cs | 10 | 8 | 51 | 47 | -- | 0 | SM |
/project/CCTrayLib/Monitoring/RemotingCruiseServerManager.cs | 6 | 4 | 26 | 21 | -- | 0 | SM |
/project/UnitTests/CCTrayLib/Monitoring/RemotingCruiseServerManagerTest.cs | 4 | 3 | 20 | 16 | -- | 0 | SM |
/project/UnitTests/CCTrayLib/Monitoring/ProjectStatusMonitorTest.cs | 3 | 2 | 20 | 16 | -- | 0 | SM |
/project/UnitTests/Remote/CruiseServerClientTests.cs | 1 | 0 | 931 | 0 | -- | 0 | SM |
/project/Remote/CruiseServerClientFactory.cs | 1 | 0 | 114 | 0 | -- | 0 | SM |
/project/Remote/RemotingConnection.cs | 1 | 1 | 195 | 21 | -- | 0 | SM |
/project/CCTrayLib/Monitoring/CruiseServerManagerFactory.cs | 1 | 1 | 6 | 6 | -- | 0 | SM |
/project/CCTrayLib/Monitoring/CruiseProjectManagerFactory.cs | 1 | 1 | 2 | 2 | -- | 0 | SM |
/project/UnitTests/CCTrayLib/Monitoring/CruiseServerManagerFactoryTest.cs | 1 | 1 | 1 | 1 | -- | 0 | SM |
/project/UnitTests/CCTrayLib/Monitoring/CruiseProjectManagerFactoryTest.cs | 1 | 1 | 1 | 1 | -- | 0 | SM |
/project/Remote/CruiseServerClient.cs | 1 | 2 | 718 | 24 | -- | 39 | UM |
/project/UnitTests/Remote/CruiseServerClientFactoryTests.cs | 1 | 8 | 144 | 98 | -- | 0 | UM |