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 |
---|
/com/lowagie/text/pdf/PdfDocument.java | 8 | 7 | 31 | 115 | -- | 1 | SM |
/com/lowagie/text/pdf/PdfEncodings.java | 6 | 5 | 108 | 106 | -- | 1 | SM |
/com/lowagie/text/pdf/PdfStamperImp.java | 4 | 3 | 13 | 174 | -- | 0 | SM |
/com/lowagie/text/pdf/PdfCopy.java | 4 | 2 | 511 | 227 | -- | 1 | SM |
/com/lowagie/text/pdf/PdfPageLabels.java | 3 | 2 | 112 | 86 | -- | 1 | SM |
/com/lowagie/text/Document.java | 2 | 0 | 3 | 0 | -- | 1 | SM |
/com/lowagie/text/pdf/PdfAnnotation.java | 1 | 0 | 142 | 0 | -- | 1 | SM |
/com/lowagie/text/xml/xmp/PdfA1Schema.java | 1 | 0 | 35 | 0 | -- | 0 | SM |
/com/lowagie/text/Chunk.java | 1 | 0 | 6 | 0 | -- | 0 | SM |
/com/lowagie/text/pdf/PdfReader.java | 3 | 3 | 54 | 54 | -- | 0 | SM |
/com/lowagie/text/pdf/DocumentFont.java | 2 | 2 | 64 | 64 | -- | 0 | SM |
/com/lowagie/text/pdf/codec/Base64.java | 1 | 1 | 1536 | 74 | -- | 0 | SM |
/com/lowagie/text/pdf/CJKFont.java | 1 | 1 | 28 | 28 | -- | 0 | SM |
/com/lowagie/text/pdf/BaseFont.java | 1 | 1 | 22 | 22 | -- | 0 | SM |
/com/lowagie/text/ImgCCITT.java | 1 | 1 | 38 | 4 | -- | 0 | SM |
/com/lowagie/text/pdf/PdfGraphics2D.java | 1 | 1 | 18 | 18 | -- | 0 | SM |
/com/lowagie/text/pdf/codec/PngImage.java | 1 | 1 | 4 | 4 | -- | 0 | SM |
/com/lowagie/text/pdf/codec/BmpImage.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
/com/lowagie/text/rtf/field/RtfField.java | 1 | 1 | 0 | 0 | -- | 0 | SM |
/com/lowagie/text/List.java | 0 | 1 | 0 | 31 | -- | 0 | UM |
/com/lowagie/text/rtf/table/RtfRow.java | 0 | 1 | 0 | 57 | -- | 0 | UM |
/com/lowagie/text/pdf/PdfCell.java | 1 | 1 | 4 | 22 | -- | 0 | UM |
/com/lowagie/text/Phrase.java | 1 | 1 | 15 | 43 | -- | 0 | UM |
/com/lowagie/text/Section.java | 0 | 2 | 0 | 64 | -- | 0 | UM |
/com/lowagie/text/Table.java | 1 | 2 | 4 | 23 | -- | 0 | UM |
/com/lowagie/text/pdf/TrueTypeFont.java | 3 | 3 | 50 | 77 | -- | 0 | UM |
/com/lowagie/text/xml/xmp/XmpWriter.java | 2 | 4 | 8 | 155 | -- | 0 | UM |
/com/lowagie/text/pdf/AcroFields.java | 5 | 5 | 83 | 163 | -- | 0 | UM |