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/viewer/Viewer.java | 12 | 11 | 101 | 96 | -- | 0 | SM |
| /src/org/jmol/viewer/StateManager.java | 6 | 5 | 103 | 21 | -- | 0 | SM |
| /src/org/jmol/util/Measure.java | 4 | 3 | 322 | 104 | -- | 0 | SM |
| /src/org/jmol/symmetry/SymmetryOperation.java | 5 | 2 | 99 | 4 | -- | 0 | SM |
| /src/org/jmol/shape/MeshCollection.java | 3 | 2 | 108 | 104 | -- | 0 | SM |
| /src/org/jmol/viewer/StatusManager.java | 3 | 2 | 22 | 9 | -- | 0 | SM |
| /src/org/jmol/g3d/Graphics3D.java | 3 | 1 | 86 | 32 | -- | 0 | SM |
| /src/org/jmol/api/JmolViewer.java | 2 | 0 | 5 | 0 | -- | 0 | SM |
| /src/org/jmol/api/TriangleServer.java | 2 | 0 | 1 | 0 | -- | 0 | SM |
| /src/org/jmol/viewer/Token.java | 1 | 0 | 1054 | 0 | -- | 2 | SM |
| /src/org/jmol/util/Parser.java | 1 | 0 | 26 | 0 | -- | 0 | 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/adapter/readers/more/GamessReader.java | 4 | 4 | 41 | 41 | -- | 0 | SM |
| /src/org/jmol/viewer/MouseManager.java | 2 | 2 | 155 | 123 | -- | 0 | SM |
| /src/org/openscience/jmol/app/jmolpanel/JmolPanel.java | 2 | 2 | 213 | 60 | -- | 0 | SM |
| /src/org/jmol/adapter/smarter/Resolver.java | 2 | 2 | 11 | 11 | -- | 0 | SM |
| /src/org/jmol/shape/Labels.java | 2 | 2 | 5 | 5 | -- | 0 | SM |
| /src/org/jmol/viewer/ScriptVariable.java | 1 | 1 | 659 | 27 | -- | 0 | SM |
| /src/org/jmol/viewer/TransformManager11.java | 1 | 1 | 130 | 130 | -- | 0 | SM |
| /src/org/jmol/shapesurface/IsosurfaceRenderer.java | 1 | 1 | 26 | 26 | -- | 0 | SM |
| /src/org/jmol/adapter/readers/more/GaussianReader.java | 1 | 1 | 21 | 21 | -- | 0 | SM |
| /src/org/jmol/symmetry/SpaceGroup.java | 1 | 1 | 6 | 6 | -- | 0 | SM |
| /src/org/jmol/symmetry/HallInfo.java | 1 | 1 | 8 | 4 | -- | 0 | SM |
| /src/org/jmol/shapesurface/IsosurfaceMesh.java | 1 | 1 | 6 | 6 | -- | 0 | SM |
| /src/org/jmol/viewer/MouseManager14.java | 1 | 1 | 6 | 4 | -- | 0 | SM |
| /src/org/jmol/shapesurface/Isosurface.java | 1 | 1 | 4 | 4 | -- | 0 | SM |
| /src/org/jmol/shapespecial/Draw.java | 1 | 1 | 4 | 4 | -- | 0 | SM |
| /src/org/jmol/shape/LabelsRenderer.java | 1 | 1 | 3 | 3 | -- | 0 | SM |
| /src/org/jmol/shape/AxesRenderer.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
| /src/org/jmol/applet/Jmol.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
| /src/org/jmol/adapter/readers/more/MOReader.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
| /src/org/jmol/adapter/readers/more/AimsReader.java | 1 | 1 | 2 | 2 | -- | 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 | 983 | 77 | -- | 0 | UM |
| /src/org/jmol/viewer/ScriptCompiler.java | 1 | 5 | 1804 | 667 | -- | 0 | UM |
| /src/org/jmol/viewer/ScriptMathProcessor.java | 1 | 6 | 1953 | 338 | -- | 0 | UM |
| /src/org/jmol/viewer/ScriptEvaluator.java | 1 | 29 | 11631 | 4979 | -- | 0 | UM |