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/tasks/DevenvTask.cs | 4 | 2 | 60 | 26 | -- | 0 | SM |
/project/core/sourcecontrol/Svn.cs | 2 | 1 | 25 | 21 | -- | 0 | SM |
/project/UnitTests/IntegrationTests/PreprocessorTest.cs | 1 | 0 | 366 | 0 | -- | 0 | SM |
/project/core/tasks/TaskBase.cs | 1 | 0 | 6 | 0 | -- | 0 | SM |
/project/CCTrayLib/Presentation/MainForm.cs | 6 | 6 | 12 | 12 | -- | 0 | SM |
/project/core/sourcecontrol/Vsts.cs | 1 | 1 | 3 | 3 | -- | 0 | SM |