Projects information

Chunk

Conflicting content
com.sparsity.dex.gdb.TypeList tlist = graph.getRawGraph().findEdgeTypes(); final List> edges = new ArrayList>(); for (Integer etype : tlist) { <<<<<<< HEAD edges.add(getOutEdgesSingleType(etype)); ======= edges.add(getOutEdgesSingleType(etype)); >>>>>>> 332f4c1233a4870dbb9f6db67cc055b897fd378c } tlist = null; return new MultiIterable(edges);

Conflicting content

        com.sparsity.dex.gdb.TypeList tlist = graph.getRawGraph().findEdgeTypes();
        final List> edges = new ArrayList>();
        for (Integer etype : tlist) {
<<<<<<< HEAD
        	edges.add(getOutEdgesSingleType(etype));
=======
            edges.add(getOutEdgesSingleType(etype));
>>>>>>> 332f4c1233a4870dbb9f6db67cc055b897fd378c
        }
        tlist = null;
        return new MultiIterable(edges);

Solution content
com.sparsity.dex.gdb.TypeList tlist = graph.getRawGraph().findEdgeTypes(); final List> edges = new ArrayList>(); for (Integer etype : tlist) { edges.add(getOutEdgesSingleType(etype)); } tlist = null; return new MultiIterable(edges);

Solution content

        com.sparsity.dex.gdb.TypeList tlist = graph.getRawGraph().findEdgeTypes();
        final List> edges = new ArrayList>();
        for (Integer etype : tlist) {
            edges.add(getOutEdgesSingleType(etype));
        }
        tlist = null;
        return new MultiIterable(edges);

File
DexVertex.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content
com.sparsity.dex.gdb.TypeList tlist = graph.getRawGraph().findEdgeTypes(); final List> vertices = new ArrayList>(); for (Integer etype : tlist) { <<<<<<< HEAD vertices.add(getOutVerticesSingleType(etype)); ======= vertices.add(getOutVerticesSingleType(etype)); >>>>>>> 332f4c1233a4870dbb9f6db67cc055b897fd378c } tlist = null; return new MultiIterable(vertices);

Conflicting content

        com.sparsity.dex.gdb.TypeList tlist = graph.getRawGraph().findEdgeTypes();
        final List> vertices = new ArrayList>();
        for (Integer etype : tlist) {
<<<<<<< HEAD
        	vertices.add(getOutVerticesSingleType(etype));
=======
            vertices.add(getOutVerticesSingleType(etype));
>>>>>>> 332f4c1233a4870dbb9f6db67cc055b897fd378c
        }
        tlist = null;
        return new MultiIterable(vertices);

Solution content
com.sparsity.dex.gdb.TypeList tlist = graph.getRawGraph().findEdgeTypes(); final List> vertices = new ArrayList>(); for (Integer etype : tlist) { vertices.add(getOutVerticesSingleType(etype)); } tlist = null; return new MultiIterable(vertices);

Solution content

        com.sparsity.dex.gdb.TypeList tlist = graph.getRawGraph().findEdgeTypes();
        final List> vertices = new ArrayList>();
        for (Integer etype : tlist) {
            vertices.add(getOutVerticesSingleType(etype));
        }
        tlist = null;
        return new MultiIterable(vertices);

File
DexVertex.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content
com.sparsity.dex.gdb.TypeList tlist = graph.getRawGraph().findEdgeTypes(); final List> edges = new ArrayList>(); for (Integer etype : tlist) { <<<<<<< HEAD edges.add(getInEdgesSingleType(etype)); ======= edges.add(getInEdgesSingleType(etype)); >>>>>>> 332f4c1233a4870dbb9f6db67cc055b897fd378c } tlist = null; return new MultiIterable(edges);

Conflicting content

        com.sparsity.dex.gdb.TypeList tlist = graph.getRawGraph().findEdgeTypes();
        final List> edges = new ArrayList>();
        for (Integer etype : tlist) {
<<<<<<< HEAD
        	edges.add(getInEdgesSingleType(etype));
=======
            edges.add(getInEdgesSingleType(etype));
>>>>>>> 332f4c1233a4870dbb9f6db67cc055b897fd378c
        }
        tlist = null;
        return new MultiIterable(edges);

Solution content
com.sparsity.dex.gdb.TypeList tlist = graph.getRawGraph().findEdgeTypes(); final List> edges = new ArrayList>(); for (Integer etype : tlist) { edges.add(getInEdgesSingleType(etype)); } tlist = null; return new MultiIterable(edges);

Solution content

        com.sparsity.dex.gdb.TypeList tlist = graph.getRawGraph().findEdgeTypes();
        final List> edges = new ArrayList>();
        for (Integer etype : tlist) {
            edges.add(getInEdgesSingleType(etype));
        }
        tlist = null;
        return new MultiIterable(edges);

File
DexVertex.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content
com.sparsity.dex.gdb.TypeList tlist = graph.getRawGraph().findEdgeTypes(); final List> vertices = new ArrayList>(); for (Integer etype : tlist) { <<<<<<< HEAD vertices.add(getInVerticesSingleType(etype)); ======= vertices.add(getInVerticesSingleType(etype)); >>>>>>> 332f4c1233a4870dbb9f6db67cc055b897fd378c } tlist = null; return new MultiIterable(vertices);

Conflicting content

        com.sparsity.dex.gdb.TypeList tlist = graph.getRawGraph().findEdgeTypes();
        final List> vertices = new ArrayList>();
        for (Integer etype : tlist) {
<<<<<<< HEAD
        	vertices.add(getInVerticesSingleType(etype));
=======
            vertices.add(getInVerticesSingleType(etype));
>>>>>>> 332f4c1233a4870dbb9f6db67cc055b897fd378c
        }
        tlist = null;
        return new MultiIterable(vertices);

Solution content
com.sparsity.dex.gdb.TypeList tlist = graph.getRawGraph().findEdgeTypes(); final List> vertices = new ArrayList>(); for (Integer etype : tlist) { vertices.add(getInVerticesSingleType(etype)); } tlist = null; return new MultiIterable(vertices);

Solution content

        com.sparsity.dex.gdb.TypeList tlist = graph.getRawGraph().findEdgeTypes();
        final List> vertices = new ArrayList>();
        for (Integer etype : tlist) {
            vertices.add(getInVerticesSingleType(etype));
        }
        tlist = null;
        return new MultiIterable(vertices);

File
DexVertex.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content
} else { final List> vertices = new ArrayList>(); for (final String label : labels) { <<<<<<< HEAD vertices.add(this.getInVerticesSingleLabel(label)); ======= vertices.add(this.getInVerticesSingleLabel(label)); >>>>>>> 332f4c1233a4870dbb9f6db67cc055b897fd378c } return new MultiIterable(vertices); }

Conflicting content

        } else {
            final List> vertices = new ArrayList>();
            for (final String label : labels) {
<<<<<<< HEAD
            	vertices.add(this.getInVerticesSingleLabel(label));
=======
                vertices.add(this.getInVerticesSingleLabel(label));
>>>>>>> 332f4c1233a4870dbb9f6db67cc055b897fd378c
            }
            return new MultiIterable(vertices);
        }

Solution content
} else { final List> vertices = new ArrayList>(); for (final String label : labels) { vertices.add(this.getInVerticesSingleLabel(label)); } return new MultiIterable(vertices); }

File
DexVertex.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content
} else { final List> vertices = new ArrayList>(); for (final String label : labels) { <<<<<<< HEAD vertices.add(this.getOutVerticesSingleLabel(label)); ======= vertices.add(this.getOutVerticesSingleLabel(label)); >>>>>>> 332f4c1233a4870dbb9f6db67cc055b897fd378c } return new MultiIterable(vertices); }

Conflicting content

        } else {
            final List> vertices = new ArrayList>();
            for (final String label : labels) {
<<<<<<< HEAD
            	vertices.add(this.getOutVerticesSingleLabel(label));
=======
                vertices.add(this.getOutVerticesSingleLabel(label));
>>>>>>> 332f4c1233a4870dbb9f6db67cc055b897fd378c
            }
            return new MultiIterable(vertices);
        }

Solution content
} else { final List> vertices = new ArrayList>(); for (final String label : labels) { vertices.add(this.getOutVerticesSingleLabel(label)); } return new MultiIterable(vertices); }

File
DexVertex.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Projects >> blueprints >>f21e3e79a0380237b3a49007e7ec9cc25435f67d