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 | 24 | 22 | 222 | 582 | -- | 0 | SM |
| /src/org/jmol/util/BinaryDocument.java | 11 | 9 | 128 | 60 | -- | 0 | SM |
| /src/org/jmol/symmetry/SymmetryOperation.java | 15 | 3 | 220 | 9 | -- | 0 | SM |
| /src/org/jmol/viewer/StateManager.java | 8 | 6 | 108 | 24 | -- | 1 | SM |
| /src/org/jmol/jvxl/readers/MrcBinaryReader.java | 9 | 2 | 164 | 175 | -- | 0 | SM |
| /src/org/jmol/modelset/ModelCollection.java | 9 | 2 | 107 | 118 | -- | 0 | SM |
| /src/org/jmol/jvxl/readers/XplorReader.java | 5 | 3 | 55 | 73 | -- | 0 | SM |
| /src/org/jmol/util/Measure.java | 4 | 3 | 322 | 104 | -- | 0 | SM |
| /src/org/jmol/g3d/Graphics3D.java | 4 | 3 | 140 | 105 | -- | 0 | SM |
| /src/org/jmol/shape/MeshCollection.java | 3 | 2 | 112 | 108 | -- | 0 | SM |
| /src/org/jmol/viewer/StatusManager.java | 3 | 2 | 22 | 9 | -- | 0 | SM |
| /src/org/jmol/viewer/TransformManager.java | 3 | 2 | 13 | 9 | -- | 0 | SM |
| /src/org/jmol/shapespecial/Polyhedra.java | 2 | 1 | 10 | 8 | -- | 0 | SM |
| /src/org/jmol/jvxl/readers/SurfaceGenerator.java | 2 | 1 | 4 | 2 | -- | 0 | SM |
| /src/org/jmol/api/JmolViewer.java | 2 | 0 | 5 | 0 | -- | 0 | SM |
| /src/org/jmol/viewer/Token.java | 1 | 0 | 1054 | 0 | -- | 3 | SM |
| /src/org/jmol/util/Parser.java | 1 | 0 | 26 | 0 | -- | 0 | SM |
| /src/org/jmol/popup/PopupResourceBundle.java | 1 | 0 | 12 | 0 | -- | 1 | SM |
| /src/org/jmol/api/TriangleServer.java | 1 | 0 | 9 | 0 | -- | 0 | SM |
| /src/org/jmol/console/JmolConsole.java | 1 | 0 | 5 | 0 | -- | 0 | SM |
| /src/org/jmol/jvxl/readers/VolumeFileReader.java | 1 | 0 | 3 | 0 | -- | 0 | SM |
| /src/org/jmol/viewer/JmolConstants.java | 1 | 0 | 2 | 0 | -- | 1 | SM |
| /src/org/jmol/g3d/Cylinder3D.java | 4 | 4 | 6 | 6 | -- | 0 | SM |
| /src/org/jmol/viewer/RepaintManager.java | 3 | 3 | 33 | 23 | -- | 0 | SM |
| /src/org/jmol/viewer/MouseManager.java | 2 | 2 | 166 | 123 | -- | 0 | SM |
| /src/org/jmol/viewer/TransformManager11.java | 2 | 2 | 136 | 136 | -- | 0 | SM |
| /src/org/jmol/adapter/readers/xml/XmlCmlReader.java | 2 | 2 | 23 | 23 | -- | 0 | SM |
| /src/org/jmol/shapespecial/Draw.java | 2 | 2 | 14 | 14 | -- | 0 | SM |
| /src/org/jmol/adapter/smarter/Resolver.java | 2 | 2 | 13 | 13 | -- | 0 | SM |
| /src/org/jmol/shape/AxesRenderer.java | 2 | 2 | 11 | 11 | -- | 0 | SM |
| /src/org/jmol/shape/Labels.java | 2 | 2 | 5 | 5 | -- | 0 | SM |
| /src/org/jmol/g3d/Sphere3D.java | 2 | 2 | 4 | 4 | -- | 0 | SM |
| /src/org/jmol/g3d/Text3D.java | 2 | 2 | 2 | 2 | -- | 0 | SM |
| /src/org/jmol/viewer/ScriptVariable.java | 1 | 1 | 659 | 27 | -- | 0 | SM |
| /src/org/jmol/adapter/readers/more/GamessReader.java | 1 | 1 | 331 | 75 | -- | 0 | SM |
| /src/org/openscience/jvxl/simplewriter/SimpleMarchingCubes.java | 1 | 1 | 344 | 6 | -- | 0 | SM |
| /src/org/jmol/adapter/readers/more/NWChemReader.java | 1 | 1 | 271 | 8 | -- | 0 | SM |
| /src/org/jmol/jvxl/readers/MapFileReader.java | 1 | 1 | 161 | 85 | -- | 0 | SM |
| /src/org/jmol/shapesurface/IsosurfaceRenderer.java | 1 | 1 | 26 | 26 | -- | 0 | SM |
| /src/org/jmol/shape/MeshRenderer.java | 1 | 1 | 18 | 15 | -- | 0 | SM |
| /src/org/jmol/util/Escape.java | 1 | 1 | 17 | 11 | -- | 0 | SM |
| /src/org/jmol/adapter/smarter/AtomSetCollectionReader.java | 1 | 1 | 14 | 14 | -- | 0 | SM |
| /src/org/jmol/g3d/Normix3D.java | 1 | 1 | 9 | 4 | -- | 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/shapespecial/PolyhedraRenderer.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/jvxl/readers/SurfaceReader.java | 1 | 1 | 5 | 2 | -- | 0 | SM |
| /src/org/jmol/shape/LabelsRenderer.java | 1 | 1 | 3 | 3 | -- | 0 | SM |
| /src/org/jmol/applet/Jmol.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
| /src/org/jmol/jvxl/readers/ApbsReader.java | 1 | 1 | 2 | 8 | -- | 0 | UM |
| /src/org/jmol/adapter/readers/more/PqrReader.java | 1 | 2 | 19 | 7 | -- | 0 | UM |
| /src/org/jmol/adapter/readers/more/AimsReader.java | 1 | 2 | 101 | 94 | -- | 0 | UM |
| /src/org/openscience/jmol/app/jmolpanel/JmolPanel.java | 1 | 2 | 210 | 60 | -- | 0 | UM |
| /src/org/jmol/adapter/readers/more/MOReader.java | 1 | 2 | 308 | 118 | -- | 0 | UM |
| /src/org/jmol/shape/Mesh.java | 2 | 2 | 16 | 33 | -- | 0 | UM |
| /src/org/jmol/adapter/readers/more/GaussianReader.java | 1 | 3 | 334 | 173 | -- | 0 | UM |
| /src/org/jmol/modelset/Atom.java | 3 | 3 | 33 | 87 | -- | 0 | UM |
| /src/org/jmol/viewer/ScriptCompilationTokenParser.java | 1 | 5 | 976 | 258 | -- | 0 | UM |
| /src/org/jmol/adapter/readers/more/CastepReader.java | 1 | 7 | 167 | 137 | -- | 0 | UM |
| /src/org/jmol/viewer/ScriptCompiler.java | 1 | 10 | 1812 | 871 | -- | 0 | UM |
| /src/org/jmol/viewer/ScriptMathProcessor.java | 1 | 10 | 1958 | 1046 | -- | 0 | UM |
| /src/org/jmol/viewer/ScriptEvaluator.java | 1 | 31 | 11645 | 5059 | -- | 0 | UM |