Projects information

Chunk

Conflicting content
boolean visit(OracleAlterIndexStatement x); void endVisit(OracleAlterIndexStatement x); boolean visit(OracleAlterTableSplitPartition x); void endVisit(OracleAlterTableSplitPartition x); <<<<<<< HEAD boolean visit(OracleAlterTableModify x); void endVisit(OracleAlterTableModify x); boolean visit(OracleAlterTableAddColumn x); void endVisit(OracleAlterTableAddColumn x); boolean visit(OracleCreateIndexStatement x); void endVisit(OracleCreateIndexStatement x); boolean visit(OracleForStatement x); void endVisit(OracleForStatement x); boolean visit(Else x); void endVisit(Else x); boolean visit(ElseIf x); void endVisit(ElseIf x); boolean visit(OracleIfStatement x); void endVisit(OracleIfStatement x); boolean visit(OracleRangeExpr x); void endVisit(OracleRangeExpr x); boolean visit(OracleAlterIndexStatement.Rebuild x); void endVisit(OracleAlterIndexStatement.Rebuild x); ======= >>>>>>> f449bbb142f34a357447af26e128b4a0587b9f47 }

Conflicting content

    boolean visit(OracleAlterIndexStatement x);
    
    void endVisit(OracleAlterIndexStatement x);
    boolean visit(OracleAlterTableSplitPartition x);
    
    void endVisit(OracleAlterTableSplitPartition x);
<<<<<<< HEAD
    
    boolean visit(OracleAlterTableModify x);
    
    void endVisit(OracleAlterTableModify x);
    
    boolean visit(OracleAlterTableAddColumn x);
    
    void endVisit(OracleAlterTableAddColumn x);
    
    boolean visit(OracleCreateIndexStatement x);
    
    void endVisit(OracleCreateIndexStatement x);
    
    boolean visit(OracleForStatement x);
    
    void endVisit(OracleForStatement x);
    
    boolean visit(Else x);
    
    void endVisit(Else x);
    
    boolean visit(ElseIf x);
    
    void endVisit(ElseIf x);
    
    boolean visit(OracleIfStatement x);
    
    void endVisit(OracleIfStatement x);
    
    boolean visit(OracleRangeExpr x);
    
    void endVisit(OracleRangeExpr x);
    
    
    boolean visit(OracleAlterIndexStatement.Rebuild x);
    
    void endVisit(OracleAlterIndexStatement.Rebuild x);
=======
>>>>>>> f449bbb142f34a357447af26e128b4a0587b9f47
}

Solution content
boolean visit(OracleAlterTableSplitPartition x); void endVisit(OracleAlterTableSplitPartition x); boolean visit(OracleAlterTableModify x); void endVisit(OracleAlterTableModify x); boolean visit(OracleAlterTableAddColumn x); void endVisit(OracleAlterTableAddColumn x); boolean visit(OracleCreateIndexStatement x); void endVisit(OracleCreateIndexStatement x); boolean visit(OracleForStatement x); void endVisit(OracleForStatement x); boolean visit(Else x); void endVisit(Else x); boolean visit(ElseIf x); void endVisit(ElseIf x); boolean visit(OracleIfStatement x); void endVisit(OracleIfStatement x); boolean visit(OracleRangeExpr x); void endVisit(OracleRangeExpr x); boolean visit(OracleAlterIndexStatement x); void endVisit(OracleAlterIndexStatement x); boolean visit(OracleAlterIndexStatement.Rebuild x); void endVisit(OracleAlterIndexStatement.Rebuild x); }

Solution content

    boolean visit(OracleAlterTableSplitPartition x);
    
    void endVisit(OracleAlterTableSplitPartition x);
    
    boolean visit(OracleAlterTableModify x);
    
    void endVisit(OracleAlterTableModify x);
    
    boolean visit(OracleAlterTableAddColumn x);
    
    void endVisit(OracleAlterTableAddColumn x);
    
    boolean visit(OracleCreateIndexStatement x);
    
    void endVisit(OracleCreateIndexStatement x);
    
    boolean visit(OracleForStatement x);
    
    void endVisit(OracleForStatement x);
    
    boolean visit(Else x);
    
    void endVisit(Else x);
    
    boolean visit(ElseIf x);
    
    void endVisit(ElseIf x);
    
    boolean visit(OracleIfStatement x);
    
    void endVisit(OracleIfStatement x);
    
    boolean visit(OracleRangeExpr x);
    
    void endVisit(OracleRangeExpr x);
    
    boolean visit(OracleAlterIndexStatement x);
    
    void endVisit(OracleAlterIndexStatement x);
    
    boolean visit(OracleAlterIndexStatement.Rebuild x);
    
    void endVisit(OracleAlterIndexStatement.Rebuild x);
}

File
OracleASTVisitor.java

Developer's decision
Version 1

Kind of conflict
Method interface

Chunk

Conflicting content
return false; } @Override public void endVisit(OracleAlterIndexStatement x) { } @Override public void endVisit(OracleCreateIndexStatement x) { } return false; } @Override @Override public boolean visit(OracleAlterIndexStatement x) { @Override public void endVisit(OracleAlterTableSplitPartition x) { <<<<<<< HEAD } @Override public boolean visit(OracleAlterTableModify x) { return false; } @Override public void endVisit(OracleAlterTableModify x) { } @Override public boolean visit(OracleAlterTableAddColumn x) { return false; } @Override public void endVisit(OracleAlterTableAddColumn x) { } @Override public boolean visit(OracleCreateIndexStatement x) { public boolean visit(OracleForStatement x) { return false; } @Override public void endVisit(OracleForStatement x) { } @Override public boolean visit(OracleAlterIndexStatement.Rebuild x) { return false; } @Override public void endVisit(OracleAlterIndexStatement.Rebuild x) { } @Override public boolean visit(Else x) { return true; } @Override public void endVisit(Else x) { } @Override public boolean visit(ElseIf x) { return true; } @Override public void endVisit(ElseIf x) { } @Override public boolean visit(OracleIfStatement x) { return true; } @Override public void endVisit(OracleIfStatement x) { } @Override public boolean visit(OracleRangeExpr x) { return true; } @Override public void endVisit(OracleRangeExpr x) { ======= >>>>>>> f449bbb142f34a357447af26e128b4a0587b9f47 } }

Conflicting content

        return false;
    }

    @Override
    public void endVisit(OracleAlterIndexStatement x) {

    }
    
    @Override
    public void endVisit(OracleCreateIndexStatement x) {

    }
        return false;
    }

    @Override

    @Override
    public boolean visit(OracleAlterIndexStatement x) {
    @Override
    public void endVisit(OracleAlterTableSplitPartition x) {

<<<<<<< HEAD
    }

    @Override
    public boolean visit(OracleAlterTableModify x) {
        return false;
    }

    @Override
    public void endVisit(OracleAlterTableModify x) {

    }

    @Override
    public boolean visit(OracleAlterTableAddColumn x) {
        return false;
    }

    @Override
    public void endVisit(OracleAlterTableAddColumn x) {

    }

    @Override
    public boolean visit(OracleCreateIndexStatement x) {
    public boolean visit(OracleForStatement x) {
        return false;
    }
    
    @Override
    public void endVisit(OracleForStatement x) {
        
    }

    @Override
    public boolean visit(OracleAlterIndexStatement.Rebuild x) {
        return false;
    }

    @Override
    public void endVisit(OracleAlterIndexStatement.Rebuild x) {

    }

    @Override
    public boolean visit(Else x) {
        return true;
    }

    @Override
    public void endVisit(Else x) {
        
    }
    
    @Override
    public boolean visit(ElseIf x) {
        return true;
    }
    
    @Override
    public void endVisit(ElseIf x) {
        
    }
    
    @Override
    public boolean visit(OracleIfStatement x) {
        return true;
    }
    
    @Override
    public void endVisit(OracleIfStatement x) {
        
    }

    @Override
    public boolean visit(OracleRangeExpr x) {
        return true;
    }

    @Override
    public void endVisit(OracleRangeExpr x) {
        
=======
>>>>>>> f449bbb142f34a357447af26e128b4a0587b9f47
    }
}

Solution content
} @Override @Override public void endVisit(OracleAlterTableSplitPartition x) { } @Override public boolean visit(OracleAlterTableModify x) { return false; } @Override public void endVisit(OracleAlterTableModify x) { } @Override public boolean visit(OracleAlterTableAddColumn x) { return false; } @Override public void endVisit(OracleAlterTableAddColumn x) { } @Override public boolean visit(OracleCreateIndexStatement x) { return false; } @Override public void endVisit(OracleCreateIndexStatement x) { } @Override public boolean visit(OracleAlterIndexStatement x) { return false; } @Override public void endVisit(OracleAlterIndexStatement x) { } @Override public boolean visit(OracleForStatement x) { return false; } @Override public void endVisit(OracleForStatement x) { } @Override public boolean visit(OracleAlterIndexStatement.Rebuild x) { return false; } @Override public void endVisit(OracleAlterIndexStatement.Rebuild x) { public void endVisit(Else x) { @Override public boolean visit(Else x) { return true; } } @Override public boolean visit(ElseIf x) { return true; } @Override public void endVisit(ElseIf x) { } @Override public boolean visit(OracleIfStatement x) { return true; } @Override public void endVisit(OracleIfStatement x) { } @Override public boolean visit(OracleRangeExpr x) { return true; } @Override public void endVisit(OracleRangeExpr x) { } }

Solution content

    }

    @Override
    @Override
    public void endVisit(OracleAlterTableSplitPartition x) {

    }

    @Override
    public boolean visit(OracleAlterTableModify x) {
        return false;
    }

    @Override
    public void endVisit(OracleAlterTableModify x) {

    }

    @Override
    public boolean visit(OracleAlterTableAddColumn x) {
        return false;
    }

    @Override
    public void endVisit(OracleAlterTableAddColumn x) {

    }

    @Override
    public boolean visit(OracleCreateIndexStatement x) {
        return false;
    }

    @Override
    public void endVisit(OracleCreateIndexStatement x) {

    }

    @Override
    public boolean visit(OracleAlterIndexStatement x) {
        return false;
    }

    @Override
    public void endVisit(OracleAlterIndexStatement x) {

    }
    
    @Override
    public boolean visit(OracleForStatement x) {
        return false;
    }
    
    @Override
    public void endVisit(OracleForStatement x) {
        
    }

    @Override
    public boolean visit(OracleAlterIndexStatement.Rebuild x) {
        return false;
    }

    @Override
    public void endVisit(OracleAlterIndexStatement.Rebuild x) {
    public void endVisit(Else x) {
    @Override
    public boolean visit(Else x) {
        return true;
    }

        
    }
    
    @Override
    public boolean visit(ElseIf x) {
        return true;
    }
    
    @Override
    public void endVisit(ElseIf x) {
        
    }
    
    @Override
    public boolean visit(OracleIfStatement x) {
        return true;
    }
    
    @Override
    public void endVisit(OracleIfStatement x) {
        
    }

    @Override
    public boolean visit(OracleRangeExpr x) {
        return true;
    }

    @Override
    public void endVisit(OracleRangeExpr x) {
        
    }
}

File
OracleSchemaStatVisitor.java

Developer's decision
Version 1

Kind of conflict
Annotation
Method declaration
Method signature

Projects >> druid >>9a31f4bbbd8040b80e9af8d9bbc8a42b629b6fe2