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/PMD.java | 5 | 4 | 317 | 249 | -- | 1 | SM |
| /src/net/sourceforge/pmd/ant/PMDTask.java | 2 | 1 | 243 | 231 | -- | 0 | SM |
| /regress/test/net/sourceforge/pmd/RuleSetTest.java | 2 | 1 | 62 | 68 | -- | 0 | SM |
| /regress/test/net/sourceforge/pmd/typeresolution/ClassTypeResolverTest.java | 2 | 1 | 49 | 6 | -- | 0 | SM |
| /src/net/sourceforge/pmd/cpd/XMLRenderer.java | 2 | 1 | 30 | 2 | -- | 0 | SM |
| /src/net/sourceforge/pmd/RuleChain.java | 2 | 1 | 17 | 7 | -- | 0 | SM |
| /src/net/sourceforge/pmd/AbstractJavaRule.java | 1 | 0 | 392 | 0 | -- | 0 | SM |
| /src/net/sourceforge/pmd/jsp/ast/JspCharStream.java | 1 | 0 | 353 | 0 | -- | 0 | SM |
| /src/net/sourceforge/pmd/ast/JavaParserVisitorAdapter.java | 1 | 0 | 331 | 0 | -- | 0 | SM |
| /src/net/sourceforge/pmd/cpd/cppast/CPPParserConstants.java | 1 | 0 | 263 | 0 | -- | 0 | SM |
| /src/net/sourceforge/pmd/ast/JavaParserTreeConstants.java | 1 | 0 | 224 | 0 | -- | 2 | SM |
| /src/net/sourceforge/pmd/jsp/ast/JspParserConstants.java | 1 | 0 | 179 | 0 | -- | 18 | SM |
| /src/net/sourceforge/pmd/jsp/rules/AbstractJspRule.java | 1 | 0 | 139 | 0 | -- | 0 | SM |
| /regress/test/net/sourceforge/pmd/jsp/ast/JspDocStyleTest.java | 1 | 0 | 130 | 0 | -- | 0 | SM |
| /src/net/sourceforge/pmd/ast/JavaParserVisitor.java | 1 | 0 | 113 | 0 | -- | 0 | SM |
| /src/net/sourceforge/pmd/jsp/ast/JspParserVisitorAdapter.java | 1 | 0 | 73 | 0 | -- | 0 | SM |
| /src/net/sourceforge/pmd/cpd/cppast/TokenMgrError.java | 1 | 0 | 72 | 0 | -- | 0 | SM |
| /src/net/sourceforge/pmd/rules/MoreThanOneLogger.java | 1 | 0 | 69 | 0 | -- | 0 | SM |
| /src/net/sourceforge/pmd/rules/design/UseSingleton.java | 1 | 0 | 67 | 0 | -- | 0 | SM |
| /src/net/sourceforge/pmd/rules/optimization/UnnecessaryWrapperObjectCreation.java | 1 | 0 | 57 | 0 | -- | 1 | SM |
| /src/net/sourceforge/pmd/ast/ASTLiteral.java | 1 | 0 | 55 | 0 | -- | 0 | SM |
| /src/net/sourceforge/pmd/jsp/ast/JspParserTreeConstants.java | 1 | 0 | 52 | 0 | -- | 1 | SM |
| /src/net/sourceforge/pmd/ast/ASTCompilationUnit.java | 1 | 0 | 34 | 0 | -- | 0 | SM |
| /src/net/sourceforge/pmd/jsp/ast/JspParserVisitor.java | 1 | 0 | 27 | 0 | -- | 0 | SM |
| /regress/test/net/sourceforge/pmd/cpd/XMLRendererTest.java | 1 | 0 | 22 | 0 | -- | 0 | SM |
| /src/net/sourceforge/pmd/rules/strings/UseIndexOfChar.java | 1 | 0 | 20 | 0 | -- | 0 | SM |
| /src/net/sourceforge/pmd/jsp/ast/CharStream.java | 1 | 0 | 15 | 0 | -- | 0 | SM |
| /src/net/sourceforge/pmd/ast/CharStream.java | 1 | 0 | 15 | 0 | -- | 0 | SM |
| /src/net/sourceforge/pmd/RuleChainVisitor.java | 1 | 0 | 7 | 0 | -- | 0 | SM |
| /src/net/sourceforge/pmd/cpd/GUI.java | 1 | 0 | 4 | 0 | -- | 0 | SM |
| /regress/test/net/sourceforge/pmd/SuppressWarningsTest.java | 3 | 3 | 48 | 42 | -- | 0 | SM |
| /src/net/sourceforge/pmd/symboltable/NameOccurrence.java | 1 | 1 | 158 | 26 | -- | 0 | SM |
| /src/net/sourceforge/pmd/rules/VariableNamingConventions.java | 1 | 1 | 121 | 41 | -- | 0 | SM |
| /src/net/sourceforge/pmd/cpd/cppast/ParseException.java | 1 | 1 | 113 | 42 | -- | 0 | SM |
| /src/net/sourceforge/pmd/rules/strings/AvoidDuplicateLiteralsRule.java | 1 | 1 | 127 | 20 | -- | 0 | SM |
| /src/net/sourceforge/pmd/symboltable/MethodNameDeclaration.java | 1 | 1 | 89 | 39 | -- | 0 | SM |
| /src/net/sourceforge/pmd/rules/SuspiciousOctalEscape.java | 1 | 1 | 81 | 44 | -- | 0 | SM |
| /src/net/sourceforge/pmd/rules/imports/UnusedImportsRule.java | 1 | 1 | 102 | 12 | -- | 0 | SM |
| /src/net/sourceforge/pmd/rules/BeanMembersShouldSerializeRule.java | 1 | 1 | 89 | 14 | -- | 0 | SM |
| /src/net/sourceforge/pmd/rules/optimization/UseStringBufferForStringAppends.java | 1 | 1 | 53 | 38 | -- | 0 | SM |
| /src/net/sourceforge/pmd/symboltable/NameFinder.java | 1 | 1 | 64 | 22 | -- | 0 | SM |
| /src/net/sourceforge/pmd/rules/strings/UselessStringValueOf.java | 1 | 1 | 64 | 21 | -- | 0 | SM |
| /regress/test/net/sourceforge/pmd/rules/basic/BasicRulesTest.java | 1 | 1 | 44 | 36 | -- | 0 | SM |
| /src/net/sourceforge/pmd/rules/junit/JUnitTestsShouldContainAsserts.java | 1 | 1 | 59 | 18 | -- | 0 | SM |
| /src/net/sourceforge/pmd/rules/AbstractPoorMethodCall.java | 1 | 1 | 48 | 24 | -- | 0 | SM |
| /src/net/sourceforge/pmd/symboltable/VariableNameDeclaration.java | 1 | 1 | 63 | 7 | -- | 0 | SM |
| /src/net/sourceforge/pmd/util/designer/Designer.java | 1 | 1 | 51 | 15 | -- | 0 | SM |
| /src/net/sourceforge/pmd/rules/design/NullAssignmentRule.java | 1 | 1 | 41 | 20 | -- | 0 | SM |
| /src/net/sourceforge/pmd/ast/ASTAnnotation.java | 1 | 1 | 39 | 22 | -- | 0 | SM |
| /src/net/sourceforge/pmd/typeresolution/PMDASMClassLoader.java | 1 | 1 | 37 | 22 | -- | 0 | SM |
| /regress/test/net/sourceforge/pmd/rules/controversial/ControversialRulesTest.java | 1 | 1 | 32 | 24 | -- | 0 | SM |
| /regress/test/net/sourceforge/pmd/rules/naming/NamingRulesTest.java | 1 | 1 | 30 | 22 | -- | 0 | SM |
| /src/net/sourceforge/pmd/rules/optimization/AvoidInstantiatingObjectsInLoops.java | 1 | 1 | 37 | 14 | -- | 0 | SM |
| /src/net/sourceforge/pmd/cpd/cppast/Token.java | 1 | 1 | 39 | 4 | -- | 1 | SM |
| /regress/test/net/sourceforge/pmd/rules/strictexception/StrictExceptionRulesTest.java | 1 | 1 | 23 | 15 | -- | 0 | SM |
| /src/net/sourceforge/pmd/cpd/SourceCode.java | 1 | 1 | 18 | 18 | -- | 0 | SM |
| /src/net/sourceforge/pmd/rules/strings/AppendCharacterWithChar.java | 1 | 1 | 19 | 13 | -- | 0 | SM |
| /regress/test/net/sourceforge/pmd/ast/JDKVersionTest.java | 1 | 1 | 15 | 15 | -- | 0 | SM |
| /src/net/sourceforge/pmd/RuleSets.java | 1 | 1 | 16 | 10 | -- | 0 | SM |
| /src/net/sourceforge/pmd/renderers/XSLTRenderer.java | 1 | 1 | 13 | 8 | -- | 0 | SM |
| /regress/test/net/sourceforge/pmd/symboltable/MethodScopeTest.java | 1 | 1 | 12 | 8 | -- | 0 | SM |
| /src/net/sourceforge/pmd/util/TypeMap.java | 0 | 1 | 0 | 4 | -- | 0 | UM |
| /src/net/sourceforge/pmd/jsp/ast/Token.java | 1 | 2 | 39 | 8 | -- | 1 | UM |
| /src/net/sourceforge/pmd/ast/Token.java | 1 | 2 | 49 | 8 | -- | 3 | UM |
| /src/net/sourceforge/pmd/rules/UselessOperationOnImmutable.java | 1 | 2 | 56 | 29 | -- | 0 | UM |
| /src/net/sourceforge/pmd/AbstractRuleChainVisitor.java | 1 | 2 | 92 | 57 | -- | 0 | UM |
| /src/net/sourceforge/pmd/rules/design/PreserveStackTrace.java | 1 | 2 | 133 | 60 | -- | 0 | UM |
| /src/net/sourceforge/pmd/rules/strings/ConsecutiveLiteralAppends.java | 1 | 2 | 223 | 87 | -- | 0 | UM |
| /src/net/sourceforge/pmd/SimpleRuleSetNameMapper.java | 1 | 3 | 74 | 52 | -- | 1 | UM |
| /src/net/sourceforge/pmd/RuleSetWriter.java | 1 | 3 | 136 | 54 | -- | 0 | UM |
| /src/net/sourceforge/pmd/rules/DoubleCheckedLocking.java | 1 | 3 | 157 | 88 | -- | 0 | UM |
| /src/net/sourceforge/pmd/cpd/cppast/SimpleCharStream.java | 1 | 3 | 357 | 68 | -- | 0 | UM |
| /src/net/sourceforge/pmd/typeresolution/ClassTypeResolver.java | 1 | 3 | 534 | 38 | -- | 0 | UM |
| /src/net/sourceforge/pmd/ast/ParseException.java | 1 | 5 | 113 | 105 | -- | 0 | UM |
| /src/net/sourceforge/pmd/jsp/ast/ParseException.java | 1 | 5 | 113 | 105 | -- | 0 | UM |
| /src/net/sourceforge/pmd/rules/UselessOverridingMethod.java | 1 | 5 | 218 | 121 | -- | 1 | UM |
| /src/net/sourceforge/pmd/jsp/ast/TokenMgrError.java | 1 | 6 | 72 | 63 | -- | 0 | UM |
| /src/net/sourceforge/pmd/ast/TokenMgrError.java | 1 | 6 | 73 | 63 | -- | 1 | UM |
| /src/net/sourceforge/pmd/ast/JavaParserTokenManager.java | 1 | 11 | 2100 | 604 | -- | 2 | UM |
| /src/net/sourceforge/pmd/jsp/ast/JJTJspParserState.java | 1 | 12 | 81 | 73 | -- | 2 | UM |
| /src/net/sourceforge/pmd/cpd/cppast/CPPParserTokenManager.java | 1 | 28 | 1655 | 1442 | -- | 1 | UM |
| /src/net/sourceforge/pmd/ast/JavaCharStream.java | 1 | 31 | 480 | 428 | -- | 0 | UM |
| /src/net/sourceforge/pmd/jsp/ast/JspParserTokenManager.java | 1 | 52 | 3762 | 2766 | -- | 8 | UM |
| /src/net/sourceforge/pmd/jsp/ast/JspParser.java | 1 | 59 | 1510 | 866 | -- | 3 | UM |
| /src/net/sourceforge/pmd/ast/JavaParser.java | 1 | 303 | 8913 | 2403 | -- | 0 | UM |