| Chunk |
|---|
| Conflicting content |
|---|
this.onMethod = (java.lang.reflect.Method) methods.get(0);
}
}
<<<<<<< HEAD
else if(pvar == null && VAR_CALLSITES.isBound()
&& fvar.ns.name.name.startsWith("clojure")
&& !RT.booleanCast(RT.get(RT.meta(fvar),dynamicKey))
// && !fvar.sym.name.equals("report")
// && fvar.isBound() && fvar.get() instanceof IFn
)
{
//todo - more specific criteria for binding these
// this.isDirect = true;
// this.siteIndex = registerVarCallsite(((VarExpr) fexpr).var);
}
=======
// else if(pvar == null && VAR_CALLSITES.isBound()
// && fvar.ns.name.name.startsWith("clojure")
// && !RT.booleanCast(RT.get(RT.meta(fvar),dynamicKey))
// )
// {
// //todo - more specific criteria for binding these
// this.isDirect = true;
// this.siteIndex = registerVarCallsite(((VarExpr) fexpr).var);
// }
>>>>>>> 77be185a6ca00a338a6647462e14206bad0e9802
}
this.tag = tag != null ? tag : (fexpr instanceof VarExpr ? ((VarExpr) fexpr).tag : null);
} |
| Solution content |
|---|
this.onMethod = (java.lang.reflect.Method) methods.get(0);
}
}
else if(pvar == null && VAR_CALLSITES.isBound()
&& fvar.ns.name.name.startsWith("clojure")
&& !RT.booleanCast(RT.get(RT.meta(fvar),dynamicKey))
// && !fvar.sym.name.equals("report")
// && fvar.isBound() && fvar.get() instanceof IFn
)
{
//todo - more specific criteria for binding these
// this.isDirect = true;
// this.siteIndex = registerVarCallsite(((VarExpr) fexpr).var);
}
}
this.tag = tag != null ? tag : (fexpr instanceof VarExpr ? ((VarExpr) fexpr).tag : null);
} |
| File |
|---|
| Compiler.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Chunk |
|---|
| Conflicting content |
|---|
if(k1 != null)
{
if(k1 instanceof Number && k2 instanceof Number)
<<<<<<< HEAD
return Numbers.equal((Number)k1, (Number)k2);
else if(k1 instanceof IPersistentCollection && k2 instanceof IPersistentCollection)
return ((IPersistentCollection)k1).equiv(k2);
=======
return Numbers.equiv(k1, k2);
else if(k1 instanceof IPersistentCollection || k2 instanceof IPersistentCollection)
return pcequiv(k1,k2);
>>>>>>> 77be185a6ca00a338a6647462e14206bad0e9802
return k1.equals(k2);
}
return false; |
| Solution content |
|---|
if(k1 != null)
{
if(k1 instanceof Number && k2 instanceof Number)
return Numbers.equal((Number)k1, (Number)k2);
else if(k1 instanceof IPersistentCollection || k2 instanceof IPersistentCollection)
return pcequiv(k1,k2);
return k1.equals(k2);
}
return false; |
| File |
|---|
| Util.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Return statement |