StrategyResolve.java

  1. /*
  2.  * Copyright (C) 2010, Christian Halstrick <christian.halstrick@sap.com>,
  3.  * Copyright (C) 2010, Matthias Sohn <matthias.sohn@sap.com> and others
  4.  *
  5.  * This program and the accompanying materials are made available under the
  6.  * terms of the Eclipse Distribution License v. 1.0 which is available at
  7.  * https://www.eclipse.org/org/documents/edl-v10.php.
  8.  *
  9.  * SPDX-License-Identifier: BSD-3-Clause
  10.  */
  11. package org.eclipse.jgit.merge;

  12. import org.eclipse.jgit.lib.Config;
  13. import org.eclipse.jgit.lib.ObjectInserter;
  14. import org.eclipse.jgit.lib.Repository;

  15. /**
  16.  * A three-way merge strategy performing a content-merge if necessary
  17.  */
  18. public class StrategyResolve extends ThreeWayMergeStrategy {

  19.     /** {@inheritDoc} */
  20.     @Override
  21.     public ThreeWayMerger newMerger(Repository db) {
  22.         return new ResolveMerger(db, false);
  23.     }

  24.     /** {@inheritDoc} */
  25.     @Override
  26.     public ThreeWayMerger newMerger(Repository db, boolean inCore) {
  27.         return new ResolveMerger(db, inCore);
  28.     }

  29.     /** {@inheritDoc} */
  30.     @Override
  31.     public ThreeWayMerger newMerger(ObjectInserter inserter, Config config) {
  32.         return new ResolveMerger(inserter, config);
  33.     }

  34.     /** {@inheritDoc} */
  35.     @Override
  36.     public String getName() {
  37.         return "resolve"; //$NON-NLS-1$
  38.     }
  39. }