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 |
---|
/drjava/src/edu/rice/cs/drjava/model/JarJDKToolsLibrary.java | 9 | 4 | 136 | 184 | -- | 0 | SM |
/plt/src/edu/rice/cs/plt/reflect/JavaVersion.java | 3 | 2 | 48 | 89 | -- | 0 | SM |
/platform/src-eclipse/edu/rice/cs/drjava/model/compiler/EclipseCompiler.java | 1 | 1 | 176 | 3 | -- | 0 | SM |
/drjava/src/edu/rice/cs/drjava/model/JDKToolsLibrary.java | 1 | 1 | 3 | 3 | -- | 0 | SM |