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 |
|---|
| /net/sf/freecol/client/control/InGameController.java | 36 | 34 | 1204 | 1069 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/ColonyPanel.java | 8 | 6 | 59 | 50 | -- | 0 | SM |
| /net/sf/freecol/common/model/Building.java | 7 | 5 | 67 | 58 | -- | 1 | SM |
| /net/sf/freecol/client/gui/TilePopup.java | 6 | 5 | 50 | 45 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/ReportTurnPanel.java | 6 | 5 | 40 | 37 | -- | 0 | SM |
| /net/sf/freecol/server/control/InGameController.java | 5 | 3 | 797 | 139 | -- | 0 | SM |
| /net/sf/freecol/common/model/Player.java | 4 | 3 | 75 | 68 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/FindSettlementDialog.java | 3 | 2 | 46 | 33 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/PreCombatDialog.java | 2 | 1 | 12 | 104 | -- | 0 | SM |
| /net/sf/freecol/common/model/NationType.java | 2 | 0 | 31 | 0 | -- | 0 | SM |
| /net/sf/freecol/client/gui/i18n/Messages.java | 1 | 0 | 24 | 0 | -- | 0 | SM |
| /net/sf/freecol/common/model/Resource.java | 1 | 0 | 6 | 0 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/FreeColPanel.java | 1 | 0 | 6 | 0 | -- | 0 | SM |
| /net/sf/freecol/common/model/TileImprovementType.java | 1 | 0 | 3 | 0 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/ProductionMultiplesLabel.java | 1 | 0 | 3 | 0 | -- | 0 | SM |
| /net/sf/freecol/client/control/InGameInputHandler.java | 16 | 16 | 293 | 293 | -- | 0 | SM |
| /net/sf/freecol/common/model/Colony.java | 9 | 9 | 77 | 77 | -- | 0 | SM |
| /net/sf/freecol/server/generator/MapGenerator.java | 9 | 9 | 49 | 49 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/ColopediaPanel.java | 8 | 8 | 27 | 27 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/BuildQueuePanel.java | 4 | 4 | 228 | 226 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/ReportNavalPanel.java | 4 | 4 | 50 | 50 | -- | 0 | SM |
| /net/sf/freecol/client/gui/menu/DebugMenu.java | 3 | 3 | 159 | 159 | -- | 0 | SM |
| /net/sf/freecol/common/model/Tile.java | 3 | 3 | 64 | 42 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/ReportColonyPanel.java | 3 | 3 | 36 | 36 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/EuropePanel.java | 3 | 3 | 35 | 21 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/ReportMilitaryPanel.java | 3 | 3 | 8 | 8 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/ReportCargoPanel.java | 3 | 3 | 8 | 8 | -- | 0 | SM |
| /net/sf/freecol/common/model/GoodsContainer.java | 2 | 2 | 54 | 54 | -- | 0 | SM |
| /net/sf/freecol/server/ai/mission/TransportMission.java | 2 | 2 | 29 | 29 | -- | 0 | SM |
| /net/sf/freecol/common/model/Market.java | 2 | 2 | 22 | 22 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/IndianSettlementPanel.java | 2 | 2 | 19 | 19 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/GoodsLabel.java | 2 | 2 | 17 | 17 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/InfoPanel.java | 2 | 2 | 14 | 14 | -- | 0 | SM |
| /net/sf/freecol/common/model/Europe.java | 2 | 2 | 8 | 8 | -- | 0 | SM |
| /net/sf/freecol/server/ai/StandardAIPlayer.java | 2 | 2 | 7 | 7 | -- | 0 | SM |
| /net/sf/freecol/client/gui/GUI.java | 2 | 2 | 6 | 6 | -- | 0 | SM |
| /net/sf/freecol/common/model/Map.java | 2 | 2 | 5 | 5 | -- | 0 | SM |
| /net/sf/freecol/common/networking/DiplomacyMessage.java | 2 | 2 | 4 | 4 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/WorkProductionPanel.java | 1 | 1 | 306 | 244 | -- | 0 | SM |
| /net/sf/freecol/common/model/Feature.java | 1 | 1 | 119 | 93 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/RebelToolTip.java | 1 | 1 | 120 | 90 | -- | 0 | SM |
| /net/sf/freecol/client/gui/action/SaveAndQuitAction.java | 1 | 1 | 87 | 30 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/EditSettlementDialog.java | 1 | 1 | 30 | 30 | -- | 0 | SM |
| /net/sf/freecol/common/networking/DeliverGiftMessage.java | 1 | 1 | 20 | 20 | -- | 0 | SM |
| /net/sf/freecol/common/model/Goods.java | 1 | 1 | 17 | 17 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/DragListener.java | 1 | 1 | 17 | 17 | -- | 0 | SM |
| /net/sf/freecol/common/networking/BuildColonyMessage.java | 1 | 1 | 12 | 12 | -- | 0 | SM |
| /net/sf/freecol/common/model/TileItemContainer.java | 1 | 1 | 12 | 12 | -- | 0 | SM |
| /net/sf/freecol/FreeCol.java | 1 | 1 | 12 | 12 | -- | 0 | SM |
| /net/sf/freecol/server/model/ServerPlayer.java | 1 | 1 | 9 | 9 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/UnitLabel.java | 1 | 1 | 8 | 8 | -- | 0 | SM |
| /net/sf/freecol/common/model/IndianNationType.java | 1 | 1 | 6 | 6 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/ConfirmDeclarationDialog.java | 1 | 1 | 6 | 6 | -- | 0 | SM |
| /net/sf/freecol/server/generator/TerrainGenerator.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
| /net/sf/freecol/server/ai/REFAIPlayer.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
| /net/sf/freecol/server/ai/IndianAIPlayer.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
| /net/sf/freecol/server/ai/ColonialAIPlayer.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
| /net/sf/freecol/common/model/TradeRouteStop.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
| /net/sf/freecol/common/model/TradeRoute.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/TilePanel.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/ReportIndianPanel.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/ReportForeignAffairPanel.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/ReportExplorationPanel.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/NegotiationDialog.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
| /net/sf/freecol/client/gui/panel/NationCellRenderer.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
| /net/sf/freecol/common/model/Location.java | 1 | 1 | 1 | 1 | -- | 0 | SM |
| /net/sf/freecol/common/model/IndianSettlement.java | 1 | 2 | 3 | 12 | -- | 0 | UM |
| /net/sf/freecol/common/model/ColonyTile.java | 1 | 2 | 12 | 12 | -- | 0 | UM |
| /net/sf/freecol/common/model/Settlement.java | 1 | 2 | 16 | 20 | -- | 0 | UM |
| /net/sf/freecol/server/control/InGameInputHandler.java | 2 | 5 | 690 | 220 | -- | 0 | UM |
| /net/sf/freecol/common/model/Unit.java | 14 | 14 | 159 | 184 | -- | 0 | UM |
| /net/sf/freecol/common/model/SimpleCombatModel.java | 37 | 38 | 456 | 456 | -- | 0 | UM |