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/config/DrJavaPropertySetup.java | 6 | 6 | 50 | 50 | -- | 0 | SM |
/src/edu/rice/cs/drjava/config/QuaternaryOpProperty.java | 4 | 4 | 16 | 16 | -- | 0 | SM |
/src/edu/rice/cs/drjava/ui/MainFrame.java | 4 | 4 | 14 | 14 | -- | 0 | SM |
/src/edu/rice/cs/util/StringOps.java | 3 | 3 | 14 | 14 | -- | 0 | SM |
/src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java | 3 | 3 | 14 | 14 | -- | 0 | SM |
/src/edu/rice/cs/util/ProcessSequence.java | 3 | 3 | 12 | 12 | -- | 0 | SM |
/src/edu/rice/cs/drjava/config/TernaryOpProperty.java | 3 | 3 | 12 | 12 | -- | 0 | SM |
/src/edu/rice/cs/drjava/config/PropertyMaps.java | 3 | 3 | 12 | 12 | -- | 0 | SM |
/src/edu/rice/cs/util/BalancingStreamTokenizer.java | 2 | 2 | 12 | 12 | -- | 0 | SM |
/src/edu/rice/cs/util/GeneralProcessCreator.java | 2 | 2 | 8 | 8 | -- | 0 | SM |
/src/edu/rice/cs/drjava/config/BinaryOpProperty.java | 2 | 2 | 8 | 8 | -- | 0 | SM |
/src/edu/rice/cs/drjava/ui/NewVersionPopup.java | 2 | 2 | 6 | 6 | -- | 0 | SM |
/src/edu/rice/cs/drjava/model/GlobalModelTestCase.java | 1 | 1 | 46 | 46 | -- | 0 | SM |
/src/edu/rice/cs/drjava/ui/ErrorPanel.java | 1 | 1 | 9 | 9 | -- | 0 | SM |
/src/edu/rice/cs/util/XMLConfig.java | 1 | 1 | 4 | 4 | -- | 0 | SM |
/src/edu/rice/cs/drjava/ui/predictive/PredictiveInputFrame.java | 1 | 1 | 4 | 4 | -- | 0 | SM |
/src/edu/rice/cs/drjava/ui/config/ConfigFrame.java | 1 | 1 | 4 | 4 | -- | 0 | SM |
/src/edu/rice/cs/drjava/model/compiler/LanguageLevelStackTraceMapper.java | 1 | 1 | 4 | 4 | -- | 0 | SM |
/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java | 1 | 1 | 4 | 4 | -- | 0 | SM |
/src/edu/rice/cs/drjava/config/UnaryOpProperty.java | 1 | 1 | 4 | 4 | -- | 0 | SM |
/src/edu/rice/cs/drjava/RemoteControlClient.java | 1 | 1 | 4 | 4 | -- | 0 | SM |
/src/edu/rice/cs/drjava/ui/ProjectMenuTest.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
/src/edu/rice/cs/drjava/config/DrJavaPropertySetupTest.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
/src/edu/rice/cs/drjava/model/repl/InteractionsModelTest.java | 0 | 1 | 0 | 24 | -- | 0 | UM |
/src/edu/rice/cs/drjava/model/GlobalModelJUnitTest.java | 0 | 1 | 0 | 36 | -- | 0 | UM |
/src/edu/rice/cs/drjava/model/junit/JUnitErrorModelTest.java | 0 | 1 | 0 | 42 | -- | 0 | UM |