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 |
---|
/exe/xului/mainpage.py | 6 | 3 | 113 | 21 | -- | 0 | SM |
/exe/engine/version.py | 1 | 0 | 8 | 0 | -- | 2 | SM |
/exe/webui/builtinblocks.py | 1 | 0 | 3 | 0 | -- | 0 | SM |
/exe/engine/idevicestore.py | 2 | 2 | 2 | 2 | -- | 0 | SM |
/exe/export/singlepageexport.py | 1 | 1 | 77 | 26 | -- | 0 | SM |
/exe/export/scormexport.py | 1 | 1 | 39 | 39 | -- | 0 | SM |
/exe/export/imsexport.py | 1 | 1 | 34 | 34 | -- | 0 | SM |
/exe/export/websiteexport.py | 1 | 1 | 31 | 31 | -- | 0 | SM |
/exe/engine/field.py | 1 | 2 | 4 | 4 | -- | 0 | UM |