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.Manager/DirectExecutor.cs | 11 | 9 | 127 | 123 | -- | 0 | SM |
/Eraser.Util/VolumeInfo.cs | 7 | 6 | 220 | 221 | -- | 0 | SM |
/Eraser/Program.cs | 5 | 4 | 409 | 163 | -- | 0 | SM |
/Eraser.DefaultPlugins/FileSystems/Windows.cs | 4 | 2 | 73 | 61 | -- | 0 | SM |
/Eraser.Util/KernelApi.cs | 1 | 0 | 413 | 0 | -- | 0 | SM |
/Eraser.Util/ShellApi.cs | 1 | 0 | 97 | 0 | -- | 0 | SM |
/Eraser/MainForm.cs | 2 | 2 | 56 | 56 | -- | 0 | SM |
/Eraser.Manager/FileSystem.cs | 2 | 2 | 9 | 9 | -- | 0 | SM |
/Eraser.Util/BlackBox.cs | 1 | 1 | 838 | 70 | -- | 0 | SM |
/Eraser.Util/AdvApi.cs | 1 | 1 | 230 | 25 | -- | 0 | SM |
/Eraser/BlackBoxMainForm.cs | 1 | 1 | 120 | 36 | -- | 0 | SM |
/Eraser/AboutForm.cs | 1 | 1 | 33 | 33 | -- | 0 | SM |
/Eraser.Util/StreamInfo.cs | 1 | 1 | 23 | 22 | -- | 0 | SM |
/Eraser.Manager/Task.cs | 1 | 1 | 20 | 20 | -- | 0 | SM |
/Eraser.DefaultPlugins/ErasureMethods/FirstLast16KB.cs | 1 | 1 | 6 | 6 | -- | 0 | SM |
/Eraser/ProgressForm.cs | 0 | 1 | 0 | 38 | -- | 0 | UM |
/Eraser/SchedulerPanel.cs | 1 | 2 | 6 | 20 | -- | 0 | UM |
/Eraser.Manager/ProgressManager.cs | 1 | 2 | 464 | 30 | -- | 0 | UM |
/Eraser/LogForm.cs | 2 | 2 | 13 | 30 | -- | 0 | UM |
/Eraser/UpdateForm.cs | 1 | 3 | 84 | 71 | -- | 0 | UM |
/Eraser/BlackBoxUploadForm.cs | 1 | 4 | 463 | 143 | -- | 0 | UM |