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/server/control/InGameController.java | 3 | 1 | 794 | 118 | -- | 0 | SM |
/net/sf/freecol/common/model/Building.java | 3 | 1 | 34 | 26 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/ColonyPanel.java | 2 | 1 | 10 | 3 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/EuropePanel.java | 1 | 0 | 14 | 0 | -- | 0 | SM |
/net/sf/freecol/common/model/NationType.java | 1 | 0 | 3 | 0 | -- | 0 | SM |
/net/sf/freecol/client/gui/TilePopup.java | 4 | 4 | 41 | 39 | -- | 0 | SM |
/net/sf/freecol/common/model/Unit.java | 2 | 2 | 59 | 59 | -- | 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/ReportColonyPanel.java | 1 | 1 | 16 | 16 | -- | 0 | SM |
/net/sf/freecol/server/generator/MapGenerator.java | 1 | 1 | 15 | 15 | -- | 0 | SM |
/net/sf/freecol/common/networking/BuildColonyMessage.java | 1 | 1 | 12 | 12 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/InfoPanel.java | 1 | 1 | 12 | 12 | -- | 0 | SM |
/net/sf/freecol/FreeCol.java | 1 | 1 | 12 | 12 | -- | 0 | SM |
/net/sf/freecol/common/model/Colony.java | 1 | 1 | 10 | 10 | -- | 0 | SM |
/net/sf/freecol/common/model/IndianNationType.java | 1 | 1 | 4 | 4 | -- | 0 | SM |
/net/sf/freecol/server/generator/TerrainGenerator.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
/net/sf/freecol/common/model/IndianSettlement.java | 0 | 1 | 0 | 9 | -- | 0 | UM |
/net/sf/freecol/common/model/Settlement.java | 1 | 2 | 16 | 20 | -- | 0 | UM |
/net/sf/freecol/server/control/InGameInputHandler.java | 1 | 3 | 332 | 80 | -- | 0 | UM |
/net/sf/freecol/client/control/InGameController.java | 15 | 18 | 819 | 720 | -- | 0 | UM |