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 |
---|
/emesenelib/XmlTemplates.py | 1 | 0 | 293 | 0 | -- | 16 | SM |
/emesenecommon.py | 1 | 0 | 68 | 0 | -- | 1 | SM |
/Conversation.py | 1 | 0 | 4 | 0 | -- | 0 | SM |
/dialog.py | 1 | 1 | 16 | 10 | -- | 0 | SM |
/plugins_base/Notification.py | 1 | 1 | 9 | 3 | -- | 0 | SM |
/plugins_base/LibNotify.py | 1 | 1 | 6 | 2 | -- | 0 | SM |
/MainMenu.py | 1 | 1 | 4 | 2 | -- | 0 | SM |