Projects >> treemachine >>fed9e4f268c36530b9f4de88559e1461eecd21b5

Chunk
Conflicting content 
            	// remember the ids of taxa we add, this is when sinking lost children
                knownIdsInTree.add(curNode.getId());
        	}
<<<<<<< HEAD
        	
            System.out.println("\n" + draftSynthesisMethod.getReport());
        	
=======
        	System.out.println("number of potential dead nodes "+draftSynthesisMethod.getDeadNodes().size());
        	TLongArrayList deadnodes = new TLongArrayList(draftSynthesisMethod.getDeadNodes());
        	//System.out.println("dead nodes "+deadnodes);
        	//should do this cleaner
        	/*
        	 * This cleans up dead nodes
        	 */
        	System.out.println("cleaning dead nodes");
        	TLongHashSet vd = new TLongHashSet();
        	int actual = 0;
        	for(int i=0;i>>>>>> c712df9bee191abce07985a384a1d609b5e0c5e5
        	tx.success();
        } catch (Exception ex) {
        	tx.failure();
Solution content 
            	// remember the ids of taxa we add, this is when sinking lost children
                knownIdsInTree.add(curNode.getId());
        	}
        	System.out.println("number of potential dead nodes "+draftSynthesisMethod.getDeadNodes().size());
        	TLongArrayList deadnodes = new TLongArrayList(draftSynthesisMethod.getDeadNodes());
        	//System.out.println("dead nodes "+deadnodes);
        	//should do this cleaner
        	/*
        	 * This cleans up dead nodes
        	 */
        	System.out.println("cleaning dead nodes");
        	TLongHashSet vd = new TLongHashSet();
        	int actual = 0;
        	for(int i=0;i
File
GraphExplorer.java
Developer's decision
Concatenation
Kind of conflict
Comment
For statement
Method invocation
Variable
Chunk
Conflicting content 
	}

	@Override
<<<<<<< HEAD
	public String getReport() {
=======
	public TLongHashSet getDupMRCAS() {
>>>>>>> c712df9bee191abce07985a384a1d609b5e0c5e5
		// TODO Auto-generated method stub
		return null;
	}
Solution content 
	}

	@Override
<<<<<<< HEAD
	public String getReport() {
=======
	public TLongHashSet getDupMRCAS() {
>>>>>>> deadends
		// TODO Auto-generated method stub
		return null;
	}
File
RankResolutionMethodInferredPath.java
Developer's decision
Manual
Kind of conflict
Method signature
Chunk
Conflicting content 
	
	public Iterable resolveConflicts(Iterable candidateRels);
	public String getDescription();
<<<<<<< HEAD
	public String getReport();
=======
	TLongHashSet getDupMRCAS();
>>>>>>> c712df9bee191abce07985a384a1d609b5e0c5e5
	
}
Solution content 
	
	public Iterable resolveConflicts(Iterable candidateRels);
	public String getDescription();
	TLongHashSet getDupMRCAS();
	public String getReport();
	
}
File
ResolutionMethod.java
Developer's decision
Concatenation
Kind of conflict
Method interface