Projects information

Chunk

Conflicting content
public class MapRedUtil { private static Log log = LogFactory.getLog(MapRedUtil.class); <<<<<<< HEAD private static final TupleFactory tf = TupleFactory.getInstance(); ======= >>>>>>> 4113e94c6ad3b90c1b5fcd25b59bac09218a6ad4 public static final String FILE_SYSTEM_NAME = "fs.default.name";

Conflicting content

public class MapRedUtil {

    private static Log log = LogFactory.getLog(MapRedUtil.class);
<<<<<<< HEAD
    private static final TupleFactory tf = TupleFactory.getInstance();
=======
>>>>>>> 4113e94c6ad3b90c1b5fcd25b59bac09218a6ad4

    public static final String FILE_SYSTEM_NAME = "fs.default.name";

Solution content
public class MapRedUtil { private static Log log = LogFactory.getLog(MapRedUtil.class); private static final TupleFactory tf = TupleFactory.getInstance(); public static final String FILE_SYSTEM_NAME = "fs.default.name";

Solution content

public class MapRedUtil {

    private static Log log = LogFactory.getLog(MapRedUtil.class);
    private static final TupleFactory tf = TupleFactory.getInstance();

    public static final String FILE_SYSTEM_NAME = "fs.default.name";

File
MapRedUtil.java

Developer's decision
Version 1

Kind of conflict
Attribute
Method invocation

Chunk

Conflicting content
<<<<<<< HEAD return baos.toString(); } /** * Returns whether the give path has a FileSystem implementation. * * @param path path * @param conf configuration * @return true if the give path's scheme has a FileSystem implementation, * false otherwise */ public static boolean hasFileSystemImpl(Path path, Configuration conf) { String scheme = path.toUri().getScheme(); if (scheme != null) { String fsImpl = conf.get("fs." + scheme + ".impl"); if (fsImpl == null) { return false; } } return true; } ======= >>>>>>> 4113e94c6ad3b90c1b5fcd25b59bac09218a6ad4 public static boolean isLocal(PigContext pigContext, Configuration conf) { return pigContext.getExecType().isLocal() \|\| conf.getBoolean(PigImplConstants.CONVERTED_TO_LOCAL, false); }

Conflicting content

<<<<<<< HEAD
        return baos.toString();
    }
    /**
     * Returns whether the give path has a FileSystem implementation.
     *
     * @param path path
     * @param conf configuration
     * @return true if the give path's scheme has a FileSystem implementation,
     *         false otherwise
     */
    public static boolean hasFileSystemImpl(Path path, Configuration conf) {
        String scheme = path.toUri().getScheme();
        if (scheme != null) {
            String fsImpl = conf.get("fs." + scheme + ".impl");
            if (fsImpl == null) {
                return false;
            }
        }
        return true;
    }

=======
>>>>>>> 4113e94c6ad3b90c1b5fcd25b59bac09218a6ad4
    public static boolean isLocal(PigContext pigContext, Configuration conf) {
        return pigContext.getExecType().isLocal() || conf.getBoolean(PigImplConstants.CONVERTED_TO_LOCAL, false);
    }

Solution content
return baos.toString(); } public static boolean isLocal(PigContext pigContext, Configuration conf) { return pigContext.getExecType().isLocal() \|\| conf.getBoolean(PigImplConstants.CONVERTED_TO_LOCAL, false); }

Solution content

        return baos.toString();
    }

    public static boolean isLocal(PigContext pigContext, Configuration conf) {
        return pigContext.getExecType().isLocal() || conf.getBoolean(PigImplConstants.CONVERTED_TO_LOCAL, false);
    }

File
Utils.java

Developer's decision
Version 2

Kind of conflict
Comment
Method declaration

Projects >> pig >>e41a7c09b56d4869f9def690291e0219c1d78614