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/org/jmol/util/Measure.java | 4 | 3 | 322 | 104 | -- | 0 | SM |
/src/org/jmol/viewer/Token.java | 1 | 0 | 1054 | 0 | -- | 1 | SM |
/src/org/jmol/shapespecial/Polyhedra.java | 1 | 0 | 1 | 0 | -- | 0 | SM |
/src/org/jmol/modelset/ModelCollection.java | 3 | 3 | 9 | 9 | -- | 0 | SM |
/src/org/jmol/viewer/ScriptVariable.java | 1 | 1 | 659 | 27 | -- | 0 | SM |
/src/org/jmol/viewer/Viewer.java | 1 | 1 | 18 | 18 | -- | 0 | SM |
/src/org/jmol/viewer/ScriptCompiler.java | 1 | 3 | 1800 | 296 | -- | 0 | UM |
/src/org/jmol/viewer/ScriptMathProcessor.java | 1 | 5 | 1950 | 250 | -- | 0 | UM |
/src/org/jmol/viewer/ScriptEvaluator.java | 1 | 8 | 11562 | 1191 | -- | 0 | UM |