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 |
---|
/fileview.py | 1 | 0 | 1019 | 0 | -- | 0 | SM |
/guiwidgets.py | 1 | 0 | 5 | 0 | -- | 0 | SM |
/version.py | 1 | 0 | 4 | 0 | -- | 0 | SM |
/phones/__init__.py | 3 | 3 | 448 | 14 | -- | 1 | SM |
/package.py | 3 | 3 | 110 | 106 | -- | 0 | SM |
/setphone_wizard.py | 1 | 5 | 514 | 150 | -- | 0 | UM |
/gui.py | 6 | 7 | 941 | 242 | -- | 0 | UM |