View Javadoc
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  
13  import org.eclipse.jgit.lib.Config;
14  import org.eclipse.jgit.lib.ObjectInserter;
15  import org.eclipse.jgit.lib.Repository;
16  
17  /**
18   * A three-way merge strategy performing a content-merge if necessary
19   */
20  public class StrategyResolve extends ThreeWayMergeStrategy {
21  
22  	/** {@inheritDoc} */
23  	@Override
24  	public ThreeWayMerger newMerger(Repository db) {
25  		return new ResolveMerger(db, false);
26  	}
27  
28  	/** {@inheritDoc} */
29  	@Override
30  	public ThreeWayMerger newMerger(Repository db, boolean inCore) {
31  		return new ResolveMerger(db, inCore);
32  	}
33  
34  	/** {@inheritDoc} */
35  	@Override
36  	public ThreeWayMerger newMerger(ObjectInserter inserter, Config config) {
37  		return new ResolveMerger(inserter, config);
38  	}
39  
40  	/** {@inheritDoc} */
41  	@Override
42  	public String getName() {
43  		return "resolve"; //$NON-NLS-1$
44  	}
45  }