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 |
---|
/fw/src/net/sourceforge/squirrel_sql/fw/dialects/DialectUtils.java | 3 | 2 | 147 | 35 | -- | 0 | SM |
/test/src/net/sourceforge/squirrel_sql/client/update/downloader/ArtifactDownloaderImplTest.java | 2 | 1 | 31 | 14 | -- | 0 | SM |
/app/src/net/sourceforge/squirrel_sql/client/Version.java | 1 | 0 | 4 | 0 | -- | 0 | SM |
/plugins/sqlscript/src/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptCommand.java | 1 | 1 | 12 | 12 | -- | 0 | SM |