Projects information

Chunk

Conflicting content
import java.math.BigInteger; import java.util.ArrayList; import java.util.Arrays; <<<<<<< HEAD import java.util.Collection; import java.util.HashSet; ======= >>>>>>> cb50a743dee006bcbe1bf196ff224af5557722f6 import java.util.List; import java.util.Set;

Conflicting content

import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Arrays;
<<<<<<< HEAD
import java.util.Collection;
import java.util.HashSet;
=======
>>>>>>> cb50a743dee006bcbe1bf196ff224af5557722f6
import java.util.List;
import java.util.Set;

Solution content
import java.math.BigInteger; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set;

File
RangeInputSplit.java

Developer's decision
Version 1

Kind of conflict
Import

Chunk

Conflicting content
sb.append(" Locations: ").append(Arrays.asList(locations)); <<<<<<< HEAD StringBuilder sb = new StringBuilder(256); sb.append("Range: ").append(range); sb.append(" Table: ").append(tableName); sb.append(" TableID: ").append(tableId); ======= sb.append(" Table: ").append(table); >>>>>>> cb50a743dee006bcbe1bf196ff224af5557722f6 sb.append(" InstanceName: ").append(instanceName); sb.append(" zooKeepers: ").append(zooKeepers); sb.append(" principal: ").append(principal);

Conflicting content

    sb.append(" Locations: ").append(Arrays.asList(locations));
<<<<<<< HEAD
    StringBuilder sb = new StringBuilder(256);
    sb.append("Range: ").append(range);
    sb.append(" Table: ").append(tableName);
    sb.append(" TableID: ").append(tableId);
=======
    sb.append(" Table: ").append(table);
>>>>>>> cb50a743dee006bcbe1bf196ff224af5557722f6
    sb.append(" InstanceName: ").append(instanceName);
    sb.append(" zooKeepers: ").append(zooKeepers);
    sb.append(" principal: ").append(principal);

Solution content
StringBuilder sb = new StringBuilder(256); sb.append("Range: ").append(range); sb.append(" Locations: ").append(Arrays.asList(locations)); sb.append(" Table: ").append(tableName); sb.append(" TableID: ").append(tableId); sb.append(" InstanceName: ").append(instanceName); sb.append(" zooKeepers: ").append(zooKeepers); sb.append(" principal: ").append(principal);

Solution content

    StringBuilder sb = new StringBuilder(256);
    sb.append("Range: ").append(range);
    sb.append(" Locations: ").append(Arrays.asList(locations));
    sb.append(" Table: ").append(tableName);
    sb.append(" TableID: ").append(tableId);
    sb.append(" InstanceName: ").append(instanceName);
    sb.append(" zooKeepers: ").append(zooKeepers);
    sb.append(" principal: ").append(principal);

File
RangeInputSplit.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Projects >> accumulo >>e135e039a33c1e3917bed87c16efcf6535418d15