Projects >> elephant-bird >>dbfeb3a414848ce3d5a6a583c77fed4a2fa82ac2

Chunk
Conflicting content 
import com.google.protobuf.Message;
import com.twitter.elephantbird.mapreduce.io.ProtobufWritable;
import com.twitter.elephantbird.util.TypeRef;
<<<<<<< HEAD

=======
import com.twitter.elephantbird.util.Protobufs;
>>>>>>> da570d232a5dcea11e19f518b07d0417c6c8a39a
import org.apache.hadoop.mapred.FileSplit;
import org.apache.hadoop.mapred.InputSplit;
import org.apache.hadoop.mapred.JobConf;
Solution content 
import com.google.protobuf.Message;
import com.twitter.elephantbird.mapreduce.io.ProtobufWritable;
import com.twitter.elephantbird.util.TypeRef;
import com.twitter.elephantbird.util.Protobufs;
import org.apache.hadoop.mapred.FileSplit;
import org.apache.hadoop.mapred.InputSplit;
import org.apache.hadoop.mapred.JobConf;
File
DeprecatedLzoProtobufBlockInputFormat.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
package com.twitter.elephantbird.proto.codegen;

import com.google.protobuf.Descriptors.Descriptor;
<<<<<<< HEAD
import com.twitter.elephantbird.pig8.util.ProtobufToPig;
=======
import com.twitter.elephantbird.pig.load.LzoProtobufB64LinePigLoader;
import com.twitter.elephantbird.pig.util.ProtobufToPig;
>>>>>>> da570d232a5dcea11e19f518b07d0417c6c8a39a
import com.twitter.elephantbird.proto.util.FormattingStringBuffer;
import com.twitter.elephantbird.proto.util.ProtogenHelper;
import com.twitter.elephantbird.util.Protobufs;
Solution content 
package com.twitter.elephantbird.proto.codegen;

import com.google.protobuf.Descriptors.Descriptor;
import com.twitter.elephantbird.pig8.util.ProtobufToPig;
import com.twitter.elephantbird.pig8.load.LzoProtobufB64LinePigLoader;
import com.twitter.elephantbird.proto.util.FormattingStringBuffer;
import com.twitter.elephantbird.proto.util.ProtogenHelper;
import com.twitter.elephantbird.util.Protobufs;
File
LzoProtobufB64LinePigletGenerator.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
package com.twitter.elephantbird.proto.codegen;

import com.google.protobuf.Descriptors.Descriptor;
<<<<<<< HEAD
import com.twitter.elephantbird.pig8.util.ProtobufToPig;
=======
import com.twitter.elephantbird.pig.load.LzoProtobufBlockPigLoader;
import com.twitter.elephantbird.pig.util.ProtobufToPig;
>>>>>>> da570d232a5dcea11e19f518b07d0417c6c8a39a
import com.twitter.elephantbird.proto.util.FormattingStringBuffer;
import com.twitter.elephantbird.proto.util.ProtogenHelper;
import com.twitter.elephantbird.util.Protobufs;
Solution content 
package com.twitter.elephantbird.proto.codegen;

import com.google.protobuf.Descriptors.Descriptor;
import com.twitter.elephantbird.pig8.util.ProtobufToPig;
import com.twitter.elephantbird.pig8.load.LzoProtobufBlockPigLoader;
import com.twitter.elephantbird.proto.util.FormattingStringBuffer;
import com.twitter.elephantbird.proto.util.ProtogenHelper;
import com.twitter.elephantbird.util.Protobufs;
File
LzoProtobufBlockPigletGenerator.java
Developer's decision
Manual
Kind of conflict
Import