https://www.eclipse.org/jgit//org.eclipse.jgit: Repository access and algorithms (Eclipse JGit Project)
  • Eclipse Distribution License (New BSD License)
  • Andrey Loskutov
  • Christian Halstrick
  • Dave Borowitz
  • David Pursehouse
  • Gunnar Wagenknecht
  • Jonathan Nieder
  • Jonathan Tan
  • Matthias Sohn
  • Sasa Zivkov
  • Terry Parker
  • Thomas Wolf 
/*
 * Copyright (C) 2010, Christian Halstrick <christian.halstrick@sap.com>,
 * Copyright (C) 2010, Matthias Sohn <matthias.sohn@sap.com> and others
 *
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Distribution License v. 1.0 which is available at
 * https://www.eclipse.org/org/documents/edl-v10.php.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */
package org.eclipse.jgit.merge;

import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.lib.ObjectInserter;
import org.eclipse.jgit.lib.Repository;


A three-way merge strategy performing a content-merge if necessary

/**
 * A three-way merge strategy performing a content-merge if necessary
 */
public class StrategyResolve extends ThreeWayMergeStrategy {

	
{@inheritDoc} 
/** {@inheritDoc} */
	@Override
	public ThreeWayMerger newMerger(Repository db) {
		return new ResolveMerger(db, false);
	}

	
{@inheritDoc} 
/** {@inheritDoc} */
	@Override
	public ThreeWayMerger newMerger(Repository db, boolean inCore) {
		return new ResolveMerger(db, inCore);
	}

	
{@inheritDoc} 
/** {@inheritDoc} */
	@Override
	public ThreeWayMerger newMerger(ObjectInserter inserter, Config config) {
		return new ResolveMerger(inserter, config);
	}

	
{@inheritDoc} 
/** {@inheritDoc} */
	@Override
	public String getName() {
		return "resolve"; //$NON-NLS-1$
	}
}