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 |
---|
/lib/matplotlib/pyplot.py | 48 | 2 | 182 | 22 | -- | 0 | SM |
/lib/matplotlib/sphinxext/plot_directive.py | 4 | 1 | 124 | 38 | -- | 1 | SM |
/lib/matplotlib/quiver.py | 2 | 1 | 30 | 12 | -- | 0 | SM |
/setupext.py | 2 | 1 | 7 | 2 | -- | 1 | SM |
/examples/mplot3d/surface3d_demo.py | 2 | 0 | 12 | 0 | -- | 0 | SM |
/examples/pylab_examples/boxplot_demo2.py | 1 | 0 | 160 | 0 | -- | 1 | SM |
/lib/matplotlib/pylab.py | 1 | 0 | 43 | 0 | -- | 0 | SM |
/lib/mpl_toolkits/mplot3d/art3d.py | 1 | 0 | 37 | 0 | -- | 0 | SM |
/examples/mplot3d/scatter3d_demo.py | 1 | 0 | 10 | 0 | -- | 0 | SM |
/lib/mpl_toolkits/axes_grid/inset_locator.py | 1 | 0 | 8 | 0 | -- | 0 | SM |
/examples/pylab_examples/load_converter.py | 1 | 0 | 7 | 0 | -- | 0 | SM |
/examples/mplot3d/bars3d_demo.py | 1 | 0 | 6 | 0 | -- | 0 | SM |
/lib/matplotlib/__init__.py | 1 | 0 | 6 | 0 | -- | 3 | SM |
/lib/matplotlib/cbook.py | 1 | 0 | 2 | 0 | -- | 0 | SM |
/lib/matplotlib/backends/backend_wx.py | 1 | 0 | 2 | 0 | -- | 1 | SM |
/lib/matplotlib/image.py | 3 | 3 | 48 | 31 | -- | 0 | SM |
/lib/matplotlib/collections.py | 1 | 1 | 22 | 12 | -- | 0 | SM |
/lib/mpl_toolkits/mplot3d/axes3d.py | 1 | 1 | 15 | 5 | -- | 0 | SM |
/lib/matplotlib/backends/backend_mixed.py | 1 | 1 | 10 | 10 | -- | 0 | SM |
/lib/matplotlib/afm.py | 1 | 1 | 4 | 4 | -- | 0 | SM |
/boilerplate.py | 0 | 0 | 0 | 0 | -- | 2 | UM |
/doc/pyplots/whats_new_99_spines.py | 0 | 0 | 0 | 0 | -- | 3 | UM |
/examples/api/date_index_formatter.py | 0 | 0 | 0 | 0 | -- | 1 | UM |
/examples/pylab_examples/barb_demo.py | 0 | 0 | 0 | 0 | -- | 1 | UM |
/examples/pylab_examples/barchart_demo2.py | 0 | 0 | 0 | 0 | -- | 1 | UM |
/examples/pylab_examples/simplification_clipping_test.py | 0 | 0 | 0 | 0 | -- | 7 | UM |
/lib/matplotlib/backends/backend_ps.py | 0 | 1 | 0 | 22 | -- | 0 | UM |
/lib/matplotlib/backends/backend_svg.py | 0 | 1 | 0 | 34 | -- | 0 | UM |
/lib/matplotlib/backends/backend_pdf.py | 0 | 1 | 0 | 48 | -- | 0 | UM |
/lib/matplotlib/axes.py | 0 | 1 | 0 | 216 | -- | 0 | UM |
/lib/matplotlib/colors.py | 0 | 2 | 0 | 55 | -- | 0 | UM |
/lib/matplotlib/legend.py | 1 | 2 | 33 | 7 | -- | 0 | UM |
/lib/matplotlib/text.py | 1 | 2 | 8 | 106 | -- | 0 | UM |
/lib/mpl_toolkits/mplot3d/axis3d.py | 2 | 2 | 27 | 33 | -- | 0 | UM |
/lib/matplotlib/projections/polar.py | 2 | 2 | 9 | 138 | -- | 0 | UM |
/lib/matplotlib/lines.py | 3 | 3 | 13 | 44 | -- | 0 | UM |
/lib/matplotlib/blocking_input.py | 2 | 6 | 18 | 26 | -- | 0 | UM |