Projects >> errai >>7a09088e5f7dade9ebc70852b2885577aa97ba9c

Chunk
Conflicting content 
    public ContextualStatementBuilder loadLiteral(Object o);

    public ContextualStatementBuilder load(Object o);
<<<<<<< HEAD

    public ContextualStatementBuilder loadStatic(Class clazz);
=======
    
    public ContextualStatementBuilder invokeStatic(Class clazz, String methodName, Object... parameters);
>>>>>>> 9372c9e8cb9224e017d2e2e4034a9aae3d003ce6

    public ObjectBuilder newObject(MetaClass type);
Solution content 
    public ContextualStatementBuilder loadLiteral(Object o);

    public ContextualStatementBuilder load(Object o);

    public ContextualStatementBuilder invokeStatic(Class clazz, String methodName, Object... parameters);

    public ObjectBuilder newObject(MetaClass type);
File
StatementBegin.java
Developer's decision
Version 2
Kind of conflict
Method interface
Chunk
Conflicting content 
        appendCallElement(new DynamicLoad(o));
        return new ContextualStatementBuilderImpl(context, callElementBuilder);
    }
<<<<<<< HEAD

    public ContextualStatementBuilder loadStatic(Class clazz) {
=======
    
    public ContextualStatementBuilder invokeStatic(Class clazz, String methodName, Object... parameters) {
>>>>>>> 9372c9e8cb9224e017d2e2e4034a9aae3d003ce6
        appendCallElement(new StaticLoad(clazz));
        return new ContextualStatementBuilderImpl(context, callElementBuilder).invoke(methodName, parameters);
    }
Solution content 
        appendCallElement(new DynamicLoad(o));
        return new ContextualStatementBuilderImpl(context, callElementBuilder);
    }

    public ContextualStatementBuilder invokeStatic(Class clazz, String methodName, Object... parameters) {
        appendCallElement(new StaticLoad(clazz));
        return new ContextualStatementBuilderImpl(context, callElementBuilder).invoke(methodName, parameters);
    }
File
StatementBuilder.java
Developer's decision
Version 2
Kind of conflict
Method signature