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 |
---|
/examples/pylab_examples/load_converter.py | 1 | 0 | 7 | 0 | -- | 0 | SM |
/lib/matplotlib/__init__.py | 1 | 0 | 6 | 0 | -- | 3 | SM |
/lib/matplotlib/backends/backend_wx.py | 1 | 0 | 2 | 0 | -- | 1 | SM |
/examples/api/date_index_formatter.py | 0 | 0 | 0 | 0 | -- | 1 | UM |
/examples/pylab_examples/barchart_demo2.py | 0 | 0 | 0 | 0 | -- | 1 | UM |