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 |
---|
/Eraser/Program.cs | 4 | 3 | 130 | 111 | -- | 0 | SM |
/Eraser.Manager/DirectExecutor.cs | 3 | 3 | 20 | 20 | -- | 0 | SM |
/Eraser.Util/BlackBox.cs | 1 | 1 | 838 | 104 | -- | 0 | SM |
/Eraser/BlackBoxMainForm.Designer.cs | 1 | 1 | 177 | 133 | -- | 0 | SM |
/Eraser/BlackBoxUploadForm.Designer.cs | 1 | 1 | 170 | 126 | -- | 0 | SM |
/Eraser/BlackBoxMainForm.cs | 1 | 1 | 116 | 36 | -- | 0 | SM |
/Eraser.DefaultPlugins/FileSystems/Windows.cs | 1 | 1 | 41 | 32 | -- | 0 | SM |
/Eraser.Util/StreamInfo.cs | 1 | 1 | 18 | 18 | -- | 0 | SM |
/Eraser.Manager/EntropySource.cs | 1 | 1 | 16 | 16 | -- | 0 | SM |
/Eraser/MainForm.cs | 1 | 1 | 5 | 5 | -- | 0 | SM |
/Eraser/SchedulerPanel.cs | 1 | 1 | 3 | 3 | -- | 0 | SM |
/Eraser.Util/VolumeInfo.cs | 0 | 1 | 0 | 35 | -- | 0 | UM |
/Eraser.Manager/ProgressManager.cs | 1 | 2 | 457 | 30 | -- | 0 | UM |
/Eraser/BlackBoxUploadForm.cs | 1 | 3 | 463 | 97 | -- | 0 | UM |