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/net/sourceforge/pmd/rules/strings/AvoidDuplicateLiteralsRule.java | 1 | 1 | 127 | 20 | -- | 0 | SM |
/src/net/sourceforge/pmd/AbstractRuleChainVisitor.java | 1 | 1 | 77 | 26 | -- | 0 | SM |
/src/net/sourceforge/pmd/SimpleRuleSetNameMapper.java | 1 | 1 | 5 | 5 | -- | 0 | SM |
/src/net/sourceforge/pmd/rules/design/PreserveStackTrace.java | 1 | 2 | 129 | 60 | -- | 0 | UM |