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/ui/MainFrame.java | 8 | 6 | 62 | 32 | -- | 0 | SM |
/src/edu/rice/cs/drjava/ui/DefinitionsPaneTest.java | 1 | 0 | 0 | 0 | -- | 0 | SM |
/src/edu/rice/cs/drjava/ui/ExternalProcessPanel.java | 4 | 4 | 22 | 22 | -- | 0 | SM |
/src/edu/rice/cs/util/StringOps.java | 3 | 3 | 12 | 12 | -- | 0 | SM |
/src/edu/rice/cs/drjava/model/compiler/LanguageLevelStackTraceMapper.java | 3 | 3 | 8 | 8 | -- | 0 | SM |
/src/edu/rice/cs/drjava/ui/EditExternalDialog.java | 2 | 2 | 28 | 28 | -- | 0 | SM |
/src/edu/rice/cs/drjava/ui/config/VectorOptionComponent.java | 2 | 2 | 12 | 12 | -- | 0 | SM |
/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java | 2 | 2 | 5 | 5 | -- | 0 | SM |
/src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java | 1 | 1 | 5 | 5 | -- | 0 | SM |
/src/edu/rice/cs/util/ProcessSequence.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
/src/edu/rice/cs/drjava/ui/RecentDocFrame.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
/src/edu/rice/cs/drjava/config/ConfigOptionListeners.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
/src/edu/rice/cs/drjava/ui/DrJavaErrorWindow.java | 0 | 0 | 0 | 0 | -- | 1 | UM |