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/sql/DatabaseObjectInfo.java | 4 | 3 | 81 | 20 | -- | 0 | SM |
/plugins/derby/src/net/sourceforge/squirrel_sql/plugins/derby/DerbyPlugin.java | 3 | 2 | 230 | 24 | -- | 0 | SM |
/fw/src/net/sourceforge/squirrel_sql/fw/sql/SQLDatabaseMetaData.java | 3 | 2 | 91 | 55 | -- | 0 | SM |
/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/tokenizer/OracleQueryTokenizer.java | 2 | 1 | 346 | 29 | -- | 1 | SM |
/app/src/net/sourceforge/squirrel_sql/client/session/schemainfo/SchemaInfo.java | 2 | 1 | 28 | 43 | -- | 0 | SM |
/app/src/net/sourceforge/squirrel_sql/client/preferences/GeneralPreferencesPanel.java | 2 | 1 | 35 | 23 | -- | 0 | SM |
/app/src/net/sourceforge/squirrel_sql/client/session/FileManager.java | 2 | 1 | 18 | 2 | -- | 0 | SM |
/app/src/net/sourceforge/squirrel_sql/client/preferences/SquirrelPreferences.java | 2 | 0 | 34 | 0 | -- | 0 | SM |
/fw/src/net/sourceforge/squirrel_sql/fw/util/Utilities.java | 1 | 0 | 52 | 0 | -- | 0 | SM |
/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/prefs/OraclePreferenceBean.java | 1 | 0 | 28 | 0 | -- | 0 | SM |
/app/src/net/sourceforge/squirrel_sql/client/session/SQLExecuterTask.java | 1 | 0 | 10 | 0 | -- | 0 | SM |
/app/src/net/sourceforge/squirrel_sql/client/Version.java | 1 | 0 | 7 | 0 | -- | 0 | SM |
/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreePanel.java | 1 | 0 | 2 | 0 | -- | 0 | SM |
/fw/src/net/sourceforge/squirrel_sql/fw/sql/ResultSetReader.java | 2 | 2 | 337 | 262 | -- | 0 | SM |
/fw/src/net/sourceforge/squirrel_sql/fw/dialects/DialectUtils.java | 1 | 1 | 785 | 238 | -- | 0 | SM |
/plugins/dbcopy/src/net/sourceforge/squirrel_sql/plugins/dbcopy/DBCopyPlugin.java | 1 | 1 | 321 | 7 | -- | 0 | SM |
/plugins/refactoring/src/net/sourceforge/squirrel_sql/plugins/refactoring/commands/ModifyColumnCommand.java | 1 | 1 | 276 | 18 | -- | 0 | SM |
/app/src/net/sourceforge/squirrel_sql/client/preferences/SquirrelPreferencesBeanInfo.java | 1 | 1 | 186 | 87 | -- | 0 | SM |
/fw/src/net/sourceforge/squirrel_sql/fw/dialects/SQLServerDialect.java | 1 | 1 | 214 | 28 | -- | 0 | SM |
/app/src/net/sourceforge/squirrel_sql/client/gui/session/SessionPanel.java | 1 | 1 | 70 | 28 | -- | 0 | SM |
/app/src/net/sourceforge/squirrel_sql/client/gui/db/DriverInternalFrame.java | 1 | 1 | 16 | 16 | -- | 0 | SM |
/app/src/net/sourceforge/squirrel_sql/client/gui/session/SessionInternalFrame.java | 1 | 1 | 15 | 15 | -- | 0 | SM |
/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeInteger.java | 1 | 1 | 12 | 12 | -- | 0 | SM |
/test/adhoc/test/MyH2Trigger.java | 1 | 1 | 11 | 10 | -- | 0 | SM |
/plugins/sybase/src/net/sourceforge/squirrel_sql/plugins/SybaseASE/SybaseASEPlugin.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
/plugins/mssql/src/net/sourceforge/squirrel_sql/plugins/mssql/MssqlPlugin.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
/plugins/dataimport/src/net/sourceforge/squirrel_sql/plugins/dataimport/DataImportPlugin.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellComponentFactory.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
/test/src/net/sourceforge/squirrel_sql/plugins/oracle/tokenizer/OracleQueryTokenizerTest.java | 1 | 2 | 23 | 22 | -- | 0 | UM |
/app/src/net/sourceforge/squirrel_sql/client/session/action/DeleteTablesCommand.java | 1 | 2 | 123 | 111 | -- | 0 | UM |
/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/prefs/OraclePluginPreferencesPanel.java | 1 | 4 | 64 | 84 | -- | 4 | UM |
/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/OraclePlugin.java | 1 | 4 | 1030 | 138 | -- | 0 | UM |
/fw/src/net/sourceforge/squirrel_sql/fw/sql/SQLConnection.java | 3 | 5 | 65 | 79 | -- | 0 | UM |
/plugins/refactoring/src/net/sourceforge/squirrel_sql/plugins/refactoring/DBUtil.java | 1 | 7 | 196 | 101 | -- | 0 | UM |
/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/table/ContentsTab.java | 5 | 6 | 74 | 50 | -- | 0 | UM |