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/StatusManager.java | 3 | 2 | 22 | 9 | -- | 0 | SM |
/src/org/jmol/symmetry/SymmetryOperation.java | 3 | 2 | 17 | 4 | -- | 0 | SM |
/src/org/jmol/g3d/Graphics3D.java | 3 | 1 | 86 | 32 | -- | 0 | SM |
/src/org/jmol/api/TriangleServer.java | 2 | 0 | 1 | 0 | -- | 0 | SM |
/src/org/jmol/viewer/Token.java | 1 | 0 | 1054 | 0 | -- | 1 | SM |
/src/org/jmol/viewer/TransformManager.java | 1 | 0 | 4 | 0 | -- | 0 | SM |
/src/org/jmol/viewer/JmolConstants.java | 1 | 0 | 2 | 0 | -- | 1 | SM |
/src/org/jmol/shapespecial/Polyhedra.java | 1 | 0 | 1 | 0 | -- | 0 | SM |
/src/org/jmol/jvxl/readers/SurfaceGenerator.java | 1 | 0 | 1 | 0 | -- | 0 | SM |
/src/org/jmol/modelset/ModelCollection.java | 6 | 6 | 93 | 89 | -- | 0 | SM |
/src/org/jmol/viewer/Viewer.java | 6 | 6 | 62 | 62 | -- | 0 | SM |
/src/org/jmol/shape/MeshCollection.java | 2 | 2 | 40 | 30 | -- | 0 | SM |
/src/org/jmol/viewer/ScriptVariable.java | 1 | 1 | 659 | 27 | -- | 0 | SM |
/src/org/jmol/shapesurface/IsosurfaceMesh.java | 1 | 1 | 6 | 6 | -- | 0 | SM |
/src/org/jmol/symmetry/HallInfo.java | 1 | 1 | 6 | 4 | -- | 0 | SM |
/src/org/jmol/shapesurface/Isosurface.java | 1 | 1 | 4 | 4 | -- | 0 | SM |
/src/org/jmol/g3d/Cylinder3D.java | 1 | 1 | 0 | 0 | -- | 0 | SM |
/src/org/jmol/popup/PopupResourceBundle.java | 0 | 0 | 0 | 0 | -- | 1 | UM |
/src/org/jmol/viewer/ScriptCompilationTokenParser.java | 1 | 2 | 982 | 76 | -- | 0 | UM |
/src/org/jmol/viewer/ScriptCompiler.java | 1 | 3 | 1800 | 296 | -- | 0 | UM |
/src/org/jmol/viewer/ScriptMathProcessor.java | 1 | 6 | 1953 | 338 | -- | 0 | UM |
/src/org/jmol/viewer/ScriptEvaluator.java | 1 | 19 | 11599 | 3670 | -- | 0 | UM |