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 |
---|
/regress/test/net/sourceforge/pmd/RuleSetTest.java | 2 | 0 | 62 | 0 | -- | 0 | SM |
/src/net/sourceforge/pmd/rules/MoreThanOneLogger.java | 1 | 0 | 69 | 0 | -- | 0 | SM |
/src/net/sourceforge/pmd/ast/ASTCompilationUnit.java | 1 | 0 | 34 | 0 | -- | 0 | SM |
/src/net/sourceforge/pmd/RuleChainVisitor.java | 1 | 0 | 7 | 0 | -- | 0 | SM |
/src/net/sourceforge/pmd/PMD.java | 4 | 4 | 373 | 251 | -- | 1 | SM |
/src/net/sourceforge/pmd/ast/JavaParserTokenManager.java | 1 | 1 | 2095 | 19 | -- | 0 | SM |
/src/net/sourceforge/pmd/rules/strings/AvoidDuplicateLiteralsRule.java | 1 | 1 | 127 | 20 | -- | 0 | SM |
/src/net/sourceforge/pmd/rules/imports/UnusedImportsRule.java | 1 | 1 | 96 | 9 | -- | 0 | SM |
/regress/test/net/sourceforge/pmd/ast/JDKVersionTest.java | 1 | 1 | 15 | 15 | -- | 0 | SM |
/src/net/sourceforge/pmd/RuleSets.java | 1 | 1 | 18 | 10 | -- | 0 | SM |
/src/net/sourceforge/pmd/SimpleRuleSetNameMapper.java | 1 | 1 | 5 | 5 | -- | 0 | SM |
/src/net/sourceforge/pmd/util/TypeMap.java | 0 | 1 | 0 | 4 | -- | 0 | UM |
/src/net/sourceforge/pmd/rules/UselessOperationOnImmutable.java | 1 | 2 | 79 | 27 | -- | 0 | UM |
/src/net/sourceforge/pmd/AbstractRuleChainVisitor.java | 1 | 2 | 92 | 57 | -- | 0 | UM |
/src/net/sourceforge/pmd/rules/design/PreserveStackTrace.java | 1 | 2 | 129 | 60 | -- | 0 | UM |
/src/net/sourceforge/pmd/rules/strings/ConsecutiveLiteralAppends.java | 1 | 2 | 223 | 87 | -- | 0 | UM |
/src/net/sourceforge/pmd/RuleChain.java | 2 | 2 | 18 | 20 | -- | 0 | UM |
/src/net/sourceforge/pmd/RuleSetWriter.java | 1 | 3 | 293 | 54 | -- | 0 | UM |
/src/net/sourceforge/pmd/ast/JavaParser.java | 1 | 46 | 8884 | 510 | -- | 0 | UM |