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/webui/element.py | 3 | 1 | 46 | 11 | -- | 0 | SM |
/exe/engine/field.py | 1 | 0 | 44 | 0 | -- | 0 | SM |
/exe/xului/mainpage.py | 2 | 2 | 15 | 13 | -- | 0 | SM |
/exe/engine/genericidevice.py | 1 | 1 | 24 | 22 | -- | 0 | SM |
/exe/webui/webserver.py | 1 | 1 | 2 | 2 | -- | 0 | SM |
/exe/webui/multichoiceblock.py | 1 | 1 | 2 | 2 | -- | 0 | SM |
/exe/webui/common.py | 1 | 1 | 2 | 2 | -- | 0 | SM |
/prototype/burningrats/burningrats.py | 0 | 0 | 0 | 0 | -- | 4 | UM |
/prototype/pyromonkey/setup.py | 0 | 0 | 0 | 0 | -- | 2 | UM |