Projects >> polly >>efbc812de6b56302631900f3e8a58bbe85231bb5

Chunk
Conflicting content 
    
    protected Namespace nspace;
    protected final Namespace rootNs;
<<<<<<< HEAD
    private final TypeUnifier unifier;
=======
    protected final ProblemReporter reporter;
>>>>>>> d04b35cddc21983f9fba24a901a1c4c9a7865d27
    
    
    public AbstractTypeResolver(Namespace namespace, ProblemReporter reporter) {
Solution content 
    
    protected Namespace nspace;
    protected final Namespace rootNs;
    protected final ProblemReporter reporter;
    
    
    public AbstractTypeResolver(Namespace namespace, ProblemReporter reporter) {
File
AbstractTypeResolver.java
Developer's decision
Version 2
Kind of conflict
Attribute
Chunk
Conflicting content 
        // create temporary namespace for executing user
        this.rootNs = namespace.enter();
        this.nspace = this.rootNs;
<<<<<<< HEAD
        this.unifier = new TypeUnifier(true);
=======
        this.reporter = reporter;
>>>>>>> d04b35cddc21983f9fba24a901a1c4c9a7865d27
    }
Solution content 
        // create temporary namespace for executing user
        this.rootNs = namespace.enter();
        this.nspace = this.rootNs;
        this.reporter = reporter;
    }
File
AbstractTypeResolver.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
            this.reportError(node.getLhs(), problem, Unparser.toString(node.getLhs()));
            return CONTINUE;
        } else if (matched.size() != 1) {
<<<<<<< HEAD
            mtc = (MapType) Type.getMostSpecific(matched, node.getPosition());
        } else {
            mtc = (MapType) matched.iterator().next();
=======
            this.ambiguousCall(node, matched);
            return CONTINUE;
>>>>>>> d04b35cddc21983f9fba24a901a1c4c9a7865d27
        }
Solution content 
            this.reportError(node.getLhs(), problem, Unparser.toString(node.getLhs()));
            return CONTINUE;
        } else if (matched.size() != 1) {
            mtc = (MapType) Type.getMostSpecific(matched, node.getPosition());
        } else {
            mtc = (MapType) matched.iterator().next();
            this.ambiguousCall(node, matched);
            return CONTINUE;
        }
File
SecondPassTypeResolver.java
Developer's decision
Concatenation
Kind of conflict
Cast expression
Method invocation
Return statement
Variable