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/repl/newjvm/ClassPathManager.java | 7 | 1 | 42 | 10 | -- | 0 | SM |
/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java | 5 | 3 | 30 | 22 | -- | 0 | SM |
/src/edu/rice/cs/drjava/model/GlobalModelTestCase.java | 1 | 0 | 2 | 0 | -- | 0 | SM |
/src/edu/rice/cs/drjava/model/GlobalEventNotifier.java | 1 | 0 | 2 | 0 | -- | 0 | SM |
/src/edu/rice/cs/drjava/ui/MainFrame.java | 2 | 2 | 35 | 7 | -- | 0 | SM |
/src/edu/rice/cs/drjava/model/repl/newjvm/InterpreterJVM.java | 1 | 1 | 15 | 15 | -- | 0 | SM |
/src/edu/rice/cs/drjava/model/debug/Breakpoint.java | 1 | 1 | 5 | 5 | -- | 0 | SM |