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 |
---|
/plugins/derby/src/net/sourceforge/squirrel_sql/plugins/derby/DerbyPlugin.java | 3 | 2 | 240 | 24 | -- | 0 | SM |
/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/table/ContentsTab.java | 3 | 1 | 55 | 9 | -- | 0 | SM |
/app/src/net/sourceforge/squirrel_sql/client/Version.java | 1 | 0 | 4 | 0 | -- | 0 | SM |