Projects >> blueprints >>1449dff2f11648ad90773dc7fec94201c143c202

Chunk
Conflicting content 
package com.tinkerpop.blueprints.pgm.oupls.sail;

<<<<<<< HEAD:blueprints-graph-sail/src/main/java/com/tinkerpop/blueprints/pgm/oupls/sail/GraphSail.java
import com.tinkerpop.blueprints.pgm.Edge;
import com.tinkerpop.blueprints.pgm.KeyIndexableGraph;
import com.tinkerpop.blueprints.pgm.TransactionalGraph;
import com.tinkerpop.blueprints.pgm.Vertex;
import com.tinkerpop.blueprints.pgm.util.wrappers.WrapperGraph;
=======
import com.tinkerpop.blueprints.CloseableIterable;
import com.tinkerpop.blueprints.Edge;
import com.tinkerpop.blueprints.Element;
import com.tinkerpop.blueprints.Index;
import com.tinkerpop.blueprints.IndexableGraph;
import com.tinkerpop.blueprints.TransactionalGraph;
import com.tinkerpop.blueprints.Vertex;
import com.tinkerpop.blueprints.util.wrappers.WrapperGraph;
>>>>>>> f9afbac5343b5ec29713fa416a2fd225f170a369:blueprints-graph-sail/src/temp/main/java/com/tinkerpop/blueprints/pgm/oupls/sail/GraphSail.java
import org.openrdf.model.BNode;
import org.openrdf.model.Literal;
import org.openrdf.model.Resource;
Solution content 
package com.tinkerpop.blueprints.pgm.oupls.sail;

import com.tinkerpop.blueprints.Edge;
import com.tinkerpop.blueprints.KeyIndexableGraph;
import com.tinkerpop.blueprints.TransactionalGraph;
import com.tinkerpop.blueprints.Vertex;
import com.tinkerpop.blueprints.util.wrappers.WrapperGraph;
import org.openrdf.model.BNode;
import org.openrdf.model.Literal;
import org.openrdf.model.Resource;
File
GraphSail.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
package com.tinkerpop.blueprints.pgm.oupls.sail;

<<<<<<< HEAD:blueprints-graph-sail/src/test/java/com/tinkerpop/blueprints/pgm/oupls/sail/DexGraphSailTest.java
=======
import com.tinkerpop.blueprints.IndexableGraph;
import com.tinkerpop.blueprints.impls.dex.DexGraph;
>>>>>>> f9afbac5343b5ec29713fa416a2fd225f170a369:blueprints-graph-sail/src/temp/test/java/com/tinkerpop/blueprints/pgm/oupls/sail/DexGraphSailTest.java
import org.junit.Test;

import static junit.framework.Assert.assertTrue;
Solution content 
package com.tinkerpop.blueprints.pgm.oupls.sail;

import org.junit.Test;

import static junit.framework.Assert.assertTrue;
File
DexGraphSailTest.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
package com.tinkerpop.blueprints.pgm.oupls.sail;

<<<<<<< HEAD:blueprints-graph-sail/src/test/java/com/tinkerpop/blueprints/pgm/oupls/sail/GraphSailTest.java
import com.tinkerpop.blueprints.pgm.Edge;
import com.tinkerpop.blueprints.pgm.Graph;
import com.tinkerpop.blueprints.pgm.KeyIndexableGraph;
import com.tinkerpop.blueprints.pgm.Vertex;
import com.tinkerpop.blueprints.pgm.impls.tg.TinkerGraph;
=======
import com.tinkerpop.blueprints.Edge;
import com.tinkerpop.blueprints.Graph;
import com.tinkerpop.blueprints.IndexableGraph;
import com.tinkerpop.blueprints.Vertex;
import com.tinkerpop.blueprints.impls.tg.TinkerGraph;
>>>>>>> f9afbac5343b5ec29713fa416a2fd225f170a369:blueprints-graph-sail/src/temp/test/java/com/tinkerpop/blueprints/pgm/oupls/sail/GraphSailTest.java
import info.aduna.iteration.CloseableIteration;
import org.junit.Test;
import org.openrdf.model.Statement;
Solution content 
package com.tinkerpop.blueprints.pgm.oupls.sail;

import com.tinkerpop.blueprints.Edge;
import com.tinkerpop.blueprints.Graph;
import com.tinkerpop.blueprints.KeyIndexableGraph;
import com.tinkerpop.blueprints.Vertex;
import com.tinkerpop.blueprints.impls.tg.TinkerGraph;
import info.aduna.iteration.CloseableIteration;
import org.junit.Test;
import org.openrdf.model.Statement;
File
GraphSailTest.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
package com.tinkerpop.blueprints.pgm.oupls.sail;

<<<<<<< HEAD:blueprints-graph-sail/src/test/java/com/tinkerpop/blueprints/pgm/oupls/sail/Neo4jGraphSailTest.java
import com.tinkerpop.blueprints.pgm.KeyIndexableGraph;
import com.tinkerpop.blueprints.pgm.impls.neo4j.Neo4jGraph;
=======
import com.tinkerpop.blueprints.IndexableGraph;
import com.tinkerpop.blueprints.impls.neo4j.Neo4jGraph;
>>>>>>> f9afbac5343b5ec29713fa416a2fd225f170a369:blueprints-graph-sail/src/temp/test/java/com/tinkerpop/blueprints/pgm/oupls/sail/Neo4jGraphSailTest.java
import org.junit.Test;

import java.io.File;
Solution content 
package com.tinkerpop.blueprints.pgm.oupls.sail;


import com.tinkerpop.blueprints.KeyIndexableGraph;
import com.tinkerpop.blueprints.impls.neo4j.Neo4jGraph;
import org.junit.Test;

import java.io.File;
File
Neo4jGraphSailTest.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
package com.tinkerpop.blueprints.pgm.oupls.sail;

<<<<<<< HEAD:blueprints-graph-sail/src/test/java/com/tinkerpop/blueprints/pgm/oupls/sail/OrientGraphSailTest.java
=======
import com.orientechnologies.orient.core.db.graph.ODatabaseGraphTx;
import com.tinkerpop.blueprints.IndexableGraph;
import com.tinkerpop.blueprints.impls.orient.OrientGraph;
>>>>>>> f9afbac5343b5ec29713fa416a2fd225f170a369:blueprints-graph-sail/src/temp/test/java/com/tinkerpop/blueprints/pgm/oupls/sail/OrientGraphSailTest.java
import junit.framework.TestCase;

/**
Solution content 
package com.tinkerpop.blueprints.pgm.oupls.sail;


import junit.framework.TestCase;

/**
File
OrientGraphSailTest.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
package com.tinkerpop.blueprints.pgm.oupls.sail;

<<<<<<< HEAD:blueprints-graph-sail/src/test/java/com/tinkerpop/blueprints/pgm/oupls/sail/TinkerGraphSailTest.java
import com.tinkerpop.blueprints.pgm.KeyIndexableGraph;
import com.tinkerpop.blueprints.pgm.impls.tg.TinkerGraph;
=======
import com.tinkerpop.blueprints.IndexableGraph;
import com.tinkerpop.blueprints.impls.tg.TinkerGraph;
>>>>>>> f9afbac5343b5ec29713fa416a2fd225f170a369:blueprints-graph-sail/src/temp/test/java/com/tinkerpop/blueprints/pgm/oupls/sail/TinkerGraphSailTest.java

/**
 * @author Joshua Shinavier (http://fortytwo.net)
Solution content 
package com.tinkerpop.blueprints.pgm.oupls.sail;


import com.tinkerpop.blueprints.KeyIndexableGraph;
import com.tinkerpop.blueprints.impls.tg.TinkerGraph;

/**
 * @author Joshua Shinavier (http://fortytwo.net)
File
TinkerGraphSailTest.java
Developer's decision
Manual
Kind of conflict
Import