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 |
---|
/src/edu/rice/cs/drjava/model/FindReplaceMachine.java | 13 | 2 | 91 | 30 | -- | 0 | SM |
/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java | 5 | 0 | 111 | 0 | -- | 0 | SM |
/src/edu/rice/cs/drjava/ui/MainFrame.java | 3 | 0 | 56 | 0 | -- | 1 | SM |
/src/edu/rice/cs/drjava/ui/config/ConfigFrame.java | 2 | 2 | 10 | 10 | -- | 0 | SM |
/src/edu/rice/cs/drjava/ui/DrJavaErrorWindow.java | 1 | 1 | 502 | 182 | -- | 0 | SM |
/src/edu/rice/cs/util/FileOps.java | 1 | 1 | 9 | 9 | -- | 0 | SM |
/src/edu/rice/cs/drjava/model/debug/NoDebuggerAvailable.java | 1 | 1 | 6 | 6 | -- | 0 | SM |
/src/edu/rice/cs/util/classloader/ToolsJarClassLoader.java | 2 | 3 | 91 | 91 | -- | 0 | UM |