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 |
---|
/guiwidgets.py | 3 | 2 | 23 | 18 | -- | 0 | SM |
/phones/__init__.py | 2 | 0 | 422 | 0 | -- | 1 | SM |
/version.py | 1 | 0 | 4 | 0 | -- | 0 | SM |
/fileview.py | 1 | 1 | 1014 | 147 | -- | 0 | SM |
/package.py | 1 | 2 | 33 | 32 | -- | 0 | UM |
/setphone_wizard.py | 1 | 2 | 503 | 45 | -- | 0 | UM |
/gui.py | 2 | 3 | 832 | 154 | -- | 0 | UM |