Projects >> GeoGig >>f59b2861987997fc6d3a44645345c4dad08d9607

Chunk
Conflicting content 
     * 
     * @param commitId the commit id to insert
     * @param parentIds the commit ids of the commit's parents
<<<<<<< HEAD
     * @return true if the commit id was inserted, false otherwise
=======
     * @return true if the commit id was inserted or updated, false if it was already there
>>>>>>> 0e0e0062eac4ed893568e8e5ed5cd07dea3e0843
     */
    @Override
    public boolean put(ObjectId commitId, ImmutableList parentIds) {
Solution content 
     * 
     * @param commitId the commit id to insert
     * @param parentIds the commit ids of the commit's parents
     * @return true if the commit id was inserted, false otherwise
     */
    @Override
    public boolean put(ObjectId commitId, ImmutableList parentIds) {
File
BlueprintsGraphDatabase.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
                    commitNode.addEdge(CommitRelationshipTypes.TOROOT.name(), root);
                    updated = true;
                }
<<<<<<< HEAD
            }

            if (!commitNode.getEdges(OUT, CommitRelationshipTypes.PARENT.name()).iterator()
                    .hasNext()) {
=======
            } else if (!commitNode
                    .getEdges(com.tinkerpop.blueprints.Direction.OUT,
                            CommitRelationshipTypes.PARENT.name()).iterator().hasNext()) {
>>>>>>> 0e0e0062eac4ed893568e8e5ed5cd07dea3e0843
                // Don't make relationships if they have been created already
                for (ObjectId parent : parentIds) {
                    Vertex parentNode = getOrAddNode(parent);
Solution content 
                    commitNode.addEdge(CommitRelationshipTypes.TOROOT.name(), root);
                    updated = true;
                }
            }

            if (!commitNode.getEdges(OUT, CommitRelationshipTypes.PARENT.name()).iterator()
                    .hasNext()) {
                // Don't make relationships if they have been created already
                for (ObjectId parent : parentIds) {
                    Vertex parentNode = getOrAddNode(parent);
File
BlueprintsGraphDatabase.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
    }

    /**
<<<<<<< HEAD
     * Gets a node or adds it if it doesn't exist
=======
     * Gets a node or adds it if it doesn't exist. Note, this must be called within a
     * {@link Transaction}.
>>>>>>> 0e0e0062eac4ed893568e8e5ed5cd07dea3e0843
     * 
     * @param commitId
     * @return
Solution content 
    }

    /**
     * Gets a node or adds it if it doesn't exist
     * 
     * @param commitId
     * @return
File
BlueprintsGraphDatabase.java
Developer's decision
Version 1
Kind of conflict
Comment