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 | 45 | 37 | 1065 | 1112 | -- | 0 | SM |
/net/sf/freecol/common/model/Unit.java | 26 | 24 | 292 | 259 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/ColonyPanel.java | 16 | 10 | 118 | 59 | -- | 0 | SM |
/net/sf/freecol/common/model/Building.java | 11 | 8 | 85 | 67 | -- | 1 | SM |
/net/sf/freecol/server/control/InGameController.java | 9 | 7 | 1312 | 170 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/BuildQueuePanel.java | 10 | 6 | 303 | 249 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/ReportTurnPanel.java | 8 | 7 | 48 | 45 | -- | 0 | SM |
/net/sf/freecol/common/model/Player.java | 6 | 5 | 151 | 97 | -- | 0 | SM |
/net/sf/freecol/common/model/Europe.java | 5 | 4 | 19 | 13 | -- | 0 | SM |
/net/sf/freecol/common/model/TileImprovement.java | 6 | 2 | 14 | 4 | -- | 1 | SM |
/net/sf/freecol/common/model/GoodsContainer.java | 4 | 3 | 60 | 58 | -- | 0 | SM |
/net/sf/freecol/client/gui/option/OptionGroupUI.java | 4 | 1 | 228 | 228 | -- | 0 | SM |
/net/sf/freecol/server/model/ServerPlayer.java | 3 | 2 | 90 | 74 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/PreCombatDialog.java | 3 | 2 | 14 | 106 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/FindSettlementDialog.java | 3 | 2 | 46 | 33 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/EditSettlementDialog.java | 3 | 2 | 35 | 32 | -- | 0 | SM |
/net/sf/freecol/common/model/Map.java | 3 | 2 | 14 | 14 | -- | 0 | SM |
/net/sf/freecol/common/model/Resource.java | 3 | 2 | 7 | 4 | -- | 0 | SM |
/net/sf/freecol/common/model/Feature.java | 3 | 1 | 123 | 93 | -- | 0 | SM |
/net/sf/freecol/client/gui/i18n/Messages.java | 2 | 1 | 205 | 60 | -- | 0 | SM |
/net/sf/freecol/common/networking/DeliverGiftMessage.java | 2 | 1 | 58 | 52 | -- | 0 | SM |
/net/sf/freecol/common/model/Goods.java | 2 | 1 | 29 | 17 | -- | 0 | SM |
/net/sf/freecol/common/networking/ClaimLandMessage.java | 2 | 1 | 21 | 19 | -- | 0 | SM |
/net/sf/freecol/common/model/TileItemContainer.java | 2 | 1 | 13 | 12 | -- | 0 | SM |
/net/sf/freecol/common/model/FoundingFather.java | 3 | 0 | 14 | 0 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/ProductionMultiplesLabel.java | 2 | 1 | 9 | 4 | -- | 0 | SM |
/net/sf/freecol/common/model/ResourceType.java | 2 | 1 | 5 | 3 | -- | 0 | SM |
/net/sf/freecol/common/model/TradeRoute.java | 2 | 1 | 4 | 3 | -- | 0 | SM |
/net/sf/freecol/common/model/GameOptions.java | 2 | 1 | 2 | 1 | -- | 0 | SM |
/net/sf/freecol/common/model/GoodsType.java | 2 | 0 | 9 | 0 | -- | 0 | SM |
/net/sf/freecol/common/model/FreeColGameObjectType.java | 2 | 0 | 7 | 0 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/FreeColPanel.java | 2 | 0 | 7 | 0 | -- | 0 | SM |
/net/sf/freecol/common/model/TileImprovementType.java | 2 | 0 | 5 | 0 | -- | 0 | SM |
/net/sf/freecol/common/model/NationOptions.java | 2 | 0 | 3 | 0 | -- | 0 | SM |
/net/sf/freecol/common/model/NationType.java | 1 | 0 | 6 | 0 | -- | 0 | SM |
/net/sf/freecol/common/model/Named.java | 1 | 0 | 2 | 0 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/ColopediaPanel.java | 33 | 33 | 97 | 97 | -- | 0 | SM |
/net/sf/freecol/common/model/Colony.java | 13 | 13 | 143 | 143 | -- | 0 | SM |
/net/sf/freecol/server/generator/MapGenerator.java | 9 | 9 | 38 | 38 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/InfoPanel.java | 8 | 8 | 34 | 34 | -- | 0 | SM |
/net/sf/freecol/client/gui/GUI.java | 7 | 7 | 95 | 95 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/EuropePanel.java | 7 | 7 | 79 | 65 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/ReportNavalPanel.java | 6 | 6 | 54 | 54 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/IndianSettlementPanel.java | 6 | 6 | 25 | 25 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/ReportMilitaryPanel.java | 5 | 5 | 12 | 12 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/ReportCargoPanel.java | 5 | 5 | 12 | 12 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/DragListener.java | 5 | 5 | 10 | 10 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/GoodsLabel.java | 4 | 4 | 31 | 31 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/TilePanel.java | 4 | 4 | 10 | 10 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/ReportIndianPanel.java | 3 | 3 | 96 | 96 | -- | 0 | SM |
/net/sf/freecol/common/model/Tile.java | 3 | 3 | 66 | 44 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/ReportColonyPanel.java | 3 | 3 | 36 | 36 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/UnitLabel.java | 3 | 3 | 26 | 26 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/ReportContinentalCongressPanel.java | 3 | 3 | 24 | 24 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/PlayersTable.java | 3 | 3 | 20 | 20 | -- | 0 | SM |
/net/sf/freecol/server/ai/mission/TransportMission.java | 3 | 3 | 14 | 14 | -- | 0 | SM |
/net/sf/freecol/server/ai/StandardAIPlayer.java | 3 | 3 | 12 | 12 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/NegotiationDialog.java | 3 | 3 | 9 | 9 | -- | 0 | SM |
/net/sf/freecol/server/ai/ProductionCache.java | 3 | 3 | 8 | 8 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/ReportLabourPanel.java | 3 | 3 | 7 | 7 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/CompactLabourReport.java | 3 | 3 | 7 | 7 | -- | 0 | SM |
/net/sf/freecol/server/ai/ColonyPlan.java | 3 | 3 | 6 | 6 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/ReportProductionPanel.java | 3 | 3 | 6 | 6 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/AdvantageCellRenderer.java | 3 | 3 | 6 | 6 | -- | 0 | SM |
/net/sf/freecol/common/model/Market.java | 2 | 2 | 22 | 22 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/ChooseFoundingFatherDialog.java | 2 | 2 | 11 | 11 | -- | 0 | SM |
/net/sf/freecol/server/ai/mission/CashInTreasureTrainMission.java | 2 | 2 | 9 | 9 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java | 2 | 2 | 6 | 6 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/MarketLabel.java | 2 | 2 | 5 | 5 | -- | 0 | SM |
/net/sf/freecol/server/generator/River.java | 2 | 2 | 4 | 4 | -- | 0 | SM |
/net/sf/freecol/common/networking/DiplomacyMessage.java | 2 | 2 | 4 | 4 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/BuildingToolTip.java | 2 | 2 | 4 | 4 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/WorkProductionPanel.java | 1 | 1 | 288 | 224 | -- | 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/common/networking/DeclareIndependenceMessage.java | 1 | 1 | 33 | 33 | -- | 0 | SM |
/net/sf/freecol/client/gui/animation/Animations.java | 1 | 1 | 30 | 25 | -- | 0 | SM |
/net/sf/freecol/common/networking/BuyMessage.java | 1 | 1 | 26 | 26 | -- | 0 | SM |
/net/sf/freecol/common/networking/BuildColonyMessage.java | 1 | 1 | 18 | 18 | -- | 0 | SM |
/net/sf/freecol/common/model/pathfinding/BaseCostDecider.java | 1 | 1 | 13 | 13 | -- | 0 | SM |
/net/sf/freecol/common/model/BuildableType.java | 1 | 1 | 13 | 13 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/ConfirmDeclarationDialog.java | 1 | 1 | 12 | 12 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/ChoiceItem.java | 1 | 1 | 12 | 12 | -- | 0 | SM |
/net/sf/freecol/FreeCol.java | 1 | 1 | 12 | 12 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/ReportHighScoresPanel.java | 1 | 1 | 10 | 10 | -- | 0 | SM |
/net/sf/freecol/server/ai/mission/PrivateerMission.java | 1 | 1 | 8 | 8 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/ReportExplorationPanel.java | 1 | 1 | 6 | 6 | -- | 0 | SM |
/net/sf/freecol/server/ai/mission/Mission.java | 1 | 1 | 4 | 4 | -- | 0 | SM |
/net/sf/freecol/common/model/IndianNationType.java | 1 | 1 | 4 | 4 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/ProductionLabel.java | 1 | 1 | 4 | 4 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/CaptureGoodsDialog.java | 1 | 1 | 4 | 4 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/WarehouseDialog.java | 1 | 1 | 3 | 3 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/DefaultTransferHandler.java | 1 | 1 | 3 | 3 | -- | 0 | SM |
/net/sf/freecol/server/generator/TerrainGenerator.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
/net/sf/freecol/server/ai/mission/PioneeringMission.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
/net/sf/freecol/server/ai/mission/IndianDemandMission.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
/net/sf/freecol/server/ai/mission/IndianBringGiftMission.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
/net/sf/freecol/server/ai/WorkerWish.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
/net/sf/freecol/server/ai/TileImprovementPlan.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/AbstractGoods.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/TrainDialog.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/ReportPanel.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/RecruitDialog.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/NationCellRenderer.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/LabourData.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/EmigrationPanel.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/CargoPanel.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/BuildingSiteToolTip.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/ColonyTile.java | 1 | 2 | 12 | 12 | -- | 0 | UM |
/net/sf/freecol/common/model/Settlement.java | 1 | 2 | 16 | 20 | -- | 0 | UM |
/net/sf/freecol/common/model/Modifier.java | 1 | 2 | 98 | 91 | -- | 0 | UM |
/net/sf/freecol/common/Specification.java | 1 | 2 | 677 | 29 | -- | 0 | UM |
/net/sf/freecol/common/model/IndianSettlement.java | 2 | 3 | 13 | 21 | -- | 0 | UM |
/net/sf/freecol/client/gui/panel/ReportRequirementsPanel.java | 5 | 5 | 21 | 68 | -- | 0 | UM |
/net/sf/freecol/server/control/InGameInputHandler.java | 5 | 6 | 535 | 224 | -- | 0 | UM |
/net/sf/freecol/client/gui/menu/DebugMenu.java | 6 | 7 | 197 | 266 | -- | 0 | UM |
/net/sf/freecol/client/gui/TilePopup.java | 9 | 9 | 91 | 106 | -- | 0 | UM |
/net/sf/freecol/client/control/InGameInputHandler.java | 19 | 19 | 282 | 285 | -- | 0 | UM |
/net/sf/freecol/common/model/SimpleCombatModel.java | 33 | 35 | 538 | 530 | -- | 0 | UM |