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 |
---|
/src/core/genj/renderer/BlueprintRenderer.java | 1 | 1 | 17 | 17 | -- | 0 | SM |
/src/core/genj/util/swing/ThumbnailWidget.java | 1 | 1 | 13 | 13 | -- | 0 | SM |
/src/core/genj/util/Resources.java | 0 | 1 | 0 | 65 | -- | 0 | UM |