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

Introduction

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

Prototype

public abstract Merger newMerger(ObjectInserter inserter, Config config);

Source Link

Document

Create a new merge instance.

Usage

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

License:Apache License

public static ThreeWayMerger newThreeWayMerger(Repository repo, final ObjectInserter inserter,
        String strategyName) {/*ww w  .java2  s.  c  o  m*/
    MergeStrategy strategy = MergeStrategy.get(strategyName);
    checkArgument(strategy != null, "invalid merge strategy: %s", strategyName);
    Merger m = strategy.newMerger(repo, true);
    checkArgument(m instanceof ThreeWayMerger, "merge strategy %s does not support three-way merging",
            strategyName);
    m.setObjectInserter(new ObjectInserter.Filter() {
        @Override
        protected ObjectInserter delegate() {
            return inserter;
        }

        @Override
        public void flush() {
        }

        @Override
        public void close() {
        }
    });
    return (ThreeWayMerger) m;
}

---