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.
CCLSCCM
FileUMSMUMSMUMSM
/net/sf/freecol/client/control/InGameController.java453710651112--0SM
/net/sf/freecol/common/model/Unit.java2624292259--0SM
/net/sf/freecol/client/gui/panel/ColonyPanel.java161011859--0SM
/net/sf/freecol/common/model/Building.java1188567--1SM
/net/sf/freecol/server/control/InGameController.java971312170--0SM
/net/sf/freecol/client/gui/panel/BuildQueuePanel.java106303249--0SM
/net/sf/freecol/client/gui/panel/ReportTurnPanel.java874845--0SM
/net/sf/freecol/common/model/Player.java6515197--0SM
/net/sf/freecol/common/model/Europe.java541913--0SM
/net/sf/freecol/common/model/TileImprovement.java62144--1SM
/net/sf/freecol/common/model/GoodsContainer.java436058--0SM
/net/sf/freecol/client/gui/option/OptionGroupUI.java41228228--0SM
/net/sf/freecol/server/model/ServerPlayer.java329074--0SM
/net/sf/freecol/client/gui/panel/PreCombatDialog.java3214106--0SM
/net/sf/freecol/client/gui/panel/FindSettlementDialog.java324633--0SM
/net/sf/freecol/client/gui/panel/EditSettlementDialog.java323532--0SM
/net/sf/freecol/common/model/Map.java321414--0SM
/net/sf/freecol/common/model/Resource.java3274--0SM
/net/sf/freecol/common/model/Feature.java3112393--0SM
/net/sf/freecol/client/gui/i18n/Messages.java2120560--0SM
/net/sf/freecol/common/networking/DeliverGiftMessage.java215852--0SM
/net/sf/freecol/common/model/Goods.java212917--0SM
/net/sf/freecol/common/networking/ClaimLandMessage.java212119--0SM
/net/sf/freecol/common/model/TileItemContainer.java211312--0SM
/net/sf/freecol/common/model/FoundingFather.java30140--0SM
/net/sf/freecol/client/gui/panel/ProductionMultiplesLabel.java2194--0SM
/net/sf/freecol/common/model/ResourceType.java2153--0SM
/net/sf/freecol/common/model/TradeRoute.java2143--0SM
/net/sf/freecol/common/model/GameOptions.java2121--0SM
/net/sf/freecol/common/model/GoodsType.java2090--0SM
/net/sf/freecol/common/model/FreeColGameObjectType.java2070--0SM
/net/sf/freecol/client/gui/panel/FreeColPanel.java2070--0SM
/net/sf/freecol/common/model/TileImprovementType.java2050--0SM
/net/sf/freecol/common/model/NationOptions.java2030--0SM
/net/sf/freecol/common/model/NationType.java1060--0SM
/net/sf/freecol/common/model/Named.java1020--0SM
/net/sf/freecol/client/gui/panel/ColopediaPanel.java33339797--0SM
/net/sf/freecol/common/model/Colony.java1313143143--0SM
/net/sf/freecol/server/generator/MapGenerator.java993838--0SM
/net/sf/freecol/client/gui/panel/InfoPanel.java883434--0SM
/net/sf/freecol/client/gui/GUI.java779595--0SM
/net/sf/freecol/client/gui/panel/EuropePanel.java777965--0SM
/net/sf/freecol/client/gui/panel/ReportNavalPanel.java665454--0SM
/net/sf/freecol/client/gui/panel/IndianSettlementPanel.java662525--0SM
/net/sf/freecol/client/gui/panel/ReportMilitaryPanel.java551212--0SM
/net/sf/freecol/client/gui/panel/ReportCargoPanel.java551212--0SM
/net/sf/freecol/client/gui/panel/DragListener.java551010--0SM
/net/sf/freecol/client/gui/panel/GoodsLabel.java443131--0SM
/net/sf/freecol/client/gui/panel/TilePanel.java441010--0SM
/net/sf/freecol/client/gui/panel/ReportIndianPanel.java339696--0SM
/net/sf/freecol/common/model/Tile.java336644--0SM
/net/sf/freecol/client/gui/panel/ReportColonyPanel.java333636--0SM
/net/sf/freecol/client/gui/panel/UnitLabel.java332626--0SM
/net/sf/freecol/client/gui/panel/ReportContinentalCongressPanel.java332424--0SM
/net/sf/freecol/client/gui/panel/PlayersTable.java332020--0SM
/net/sf/freecol/server/ai/mission/TransportMission.java331414--0SM
/net/sf/freecol/server/ai/StandardAIPlayer.java331212--0SM
/net/sf/freecol/client/gui/panel/NegotiationDialog.java3399--0SM
/net/sf/freecol/server/ai/ProductionCache.java3388--0SM
/net/sf/freecol/client/gui/panel/ReportLabourPanel.java3377--0SM
/net/sf/freecol/client/gui/panel/CompactLabourReport.java3377--0SM
/net/sf/freecol/server/ai/ColonyPlan.java3366--0SM
/net/sf/freecol/client/gui/panel/ReportProductionPanel.java3366--0SM
/net/sf/freecol/client/gui/panel/AdvantageCellRenderer.java3366--0SM
/net/sf/freecol/common/model/Market.java222222--0SM
/net/sf/freecol/client/gui/panel/ChooseFoundingFatherDialog.java221111--0SM
/net/sf/freecol/server/ai/mission/CashInTreasureTrainMission.java2299--0SM
/net/sf/freecol/client/gui/panel/MapEditorTransformPanel.java2266--0SM
/net/sf/freecol/client/gui/panel/MarketLabel.java2255--0SM
/net/sf/freecol/server/generator/River.java2244--0SM
/net/sf/freecol/common/networking/DiplomacyMessage.java2244--0SM
/net/sf/freecol/client/gui/panel/BuildingToolTip.java2244--0SM
/net/sf/freecol/client/gui/panel/WorkProductionPanel.java11288224--0SM
/net/sf/freecol/client/gui/panel/RebelToolTip.java1112090--0SM
/net/sf/freecol/client/gui/action/SaveAndQuitAction.java118730--0SM
/net/sf/freecol/common/networking/DeclareIndependenceMessage.java113333--0SM
/net/sf/freecol/client/gui/animation/Animations.java113025--0SM
/net/sf/freecol/common/networking/BuyMessage.java112626--0SM
/net/sf/freecol/common/networking/BuildColonyMessage.java111818--0SM
/net/sf/freecol/common/model/pathfinding/BaseCostDecider.java111313--0SM
/net/sf/freecol/common/model/BuildableType.java111313--0SM
/net/sf/freecol/client/gui/panel/ConfirmDeclarationDialog.java111212--0SM
/net/sf/freecol/client/gui/panel/ChoiceItem.java111212--0SM
/net/sf/freecol/FreeCol.java111212--0SM
/net/sf/freecol/client/gui/panel/ReportHighScoresPanel.java111010--0SM
/net/sf/freecol/server/ai/mission/PrivateerMission.java1188--0SM
/net/sf/freecol/client/gui/panel/ReportExplorationPanel.java1166--0SM
/net/sf/freecol/server/ai/mission/Mission.java1144--0SM
/net/sf/freecol/common/model/IndianNationType.java1144--0SM
/net/sf/freecol/client/gui/panel/ProductionLabel.java1144--0SM
/net/sf/freecol/client/gui/panel/CaptureGoodsDialog.java1144--0SM
/net/sf/freecol/client/gui/panel/WarehouseDialog.java1133--0SM
/net/sf/freecol/client/gui/panel/DefaultTransferHandler.java1133--0SM
/net/sf/freecol/server/generator/TerrainGenerator.java1122--0SM
/net/sf/freecol/server/ai/mission/PioneeringMission.java1122--0SM
/net/sf/freecol/server/ai/mission/IndianDemandMission.java1122--0SM
/net/sf/freecol/server/ai/mission/IndianBringGiftMission.java1122--0SM
/net/sf/freecol/server/ai/WorkerWish.java1122--0SM
/net/sf/freecol/server/ai/TileImprovementPlan.java1122--0SM
/net/sf/freecol/server/ai/REFAIPlayer.java1122--0SM
/net/sf/freecol/server/ai/IndianAIPlayer.java1122--0SM
/net/sf/freecol/server/ai/ColonialAIPlayer.java1122--0SM
/net/sf/freecol/common/model/TradeRouteStop.java1122--0SM
/net/sf/freecol/common/model/AbstractGoods.java1122--0SM
/net/sf/freecol/client/gui/panel/TrainDialog.java1122--0SM
/net/sf/freecol/client/gui/panel/ReportPanel.java1122--0SM
/net/sf/freecol/client/gui/panel/ReportForeignAffairPanel.java1122--0SM
/net/sf/freecol/client/gui/panel/RecruitDialog.java1122--0SM
/net/sf/freecol/client/gui/panel/NationCellRenderer.java1122--0SM
/net/sf/freecol/client/gui/panel/LabourData.java1122--0SM
/net/sf/freecol/client/gui/panel/EmigrationPanel.java1122--0SM
/net/sf/freecol/client/gui/panel/CargoPanel.java1122--0SM
/net/sf/freecol/client/gui/panel/BuildingSiteToolTip.java1122--0SM
/net/sf/freecol/common/model/Location.java1111--0SM
/net/sf/freecol/common/model/ColonyTile.java121212--0UM
/net/sf/freecol/common/model/Settlement.java121620--0UM
/net/sf/freecol/common/model/Modifier.java129891--0UM
/net/sf/freecol/common/Specification.java1267729--0UM
/net/sf/freecol/common/model/IndianSettlement.java231321--0UM
/net/sf/freecol/client/gui/panel/ReportRequirementsPanel.java552168--0UM
/net/sf/freecol/server/control/InGameInputHandler.java56535224--0UM
/net/sf/freecol/client/gui/menu/DebugMenu.java67197266--0UM
/net/sf/freecol/client/gui/TilePopup.java9991106--0UM
/net/sf/freecol/client/control/InGameInputHandler.java1919282285--0UM
/net/sf/freecol/common/model/SimpleCombatModel.java3335538530--0UM