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/gui/panel/ColonyPanel.java | 4 | 1 | 20 | 3 | -- | 0 | SM |
/net/sf/freecol/server/control/InGameController.java | 2 | 1 | 121 | 118 | -- | 0 | SM |
/net/sf/freecol/common/model/Building.java | 2 | 1 | 29 | 26 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/EuropePanel.java | 1 | 0 | 14 | 0 | -- | 0 | SM |
/net/sf/freecol/client/gui/TilePopup.java | 4 | 4 | 41 | 39 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/WorkProductionPanel.java | 1 | 1 | 306 | 244 | -- | 0 | SM |
/net/sf/freecol/server/control/InGameInputHandler.java | 1 | 1 | 336 | 53 | -- | 0 | SM |
/net/sf/freecol/common/model/Feature.java | 1 | 1 | 119 | 93 | -- | 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/IndianSettlement.java | 0 | 1 | 0 | 9 | -- | 0 | UM |
/net/sf/freecol/client/control/InGameController.java | 12 | 14 | 780 | 636 | -- | 0 | UM |