Example usage for org.eclipse.jgit.merge MergeStrategy SIMPLE_TWO_WAY_IN_CORE

Introduction

In this page you can find the example usage for org.eclipse.jgit.merge MergeStrategy SIMPLE_TWO_WAY_IN_CORE.

Prototype

ThreeWayMergeStrategy SIMPLE_TWO_WAY_IN_CORE

To view the source code for org.eclipse.jgit.merge MergeStrategy SIMPLE_TWO_WAY_IN_CORE.

Click Source Link

Document

Simple strategy to merge paths, without simultaneous edits.

Usage

From source file:com.google.gerrit.server.git.MergeUtil.java

License:Apache License

public static String mergeStrategyName(boolean useContentMerge, boolean useRecursiveMerge) {
    if (useContentMerge) {
        // Settings for this project allow us to try and automatically resolve
        // conflicts within files if needed. Use either the old resolve merger or
        // new recursive merger, and instruct to operate in core.
        if (useRecursiveMerge) {
            return MergeStrategy.RECURSIVE.getName();
        } else {/*from   w ww. j  a  v a2 s .c o m*/
            return MergeStrategy.RESOLVE.getName();
        }
    } else {
        // No auto conflict resolving allowed. If any of the
        // affected files was modified, merge will fail.
        return MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.getName();
    }
}

---