1 /*
2 * Copyright (C) 2010, Christian Halstrick <christian.halstrick@sap.com>,
3 * Copyright (C) 2010, Matthias Sohn <matthias.sohn@sap.com>
4 * and other copyright owners as documented in the project's IP log.
5 *
6 * This program and the accompanying materials are made available
7 * under the terms of the Eclipse Distribution License v1.0 which
8 * accompanies this distribution, is reproduced below, and is
9 * available at http://www.eclipse.org/org/documents/edl-v10.php
10 *
11 * All rights reserved.
12 *
13 * Redistribution and use in source and binary forms, with or
14 * without modification, are permitted provided that the following
15 * conditions are met:
16 *
17 * - Redistributions of source code must retain the above copyright
18 * notice, this list of conditions and the following disclaimer.
19 *
20 * - Redistributions in binary form must reproduce the above
21 * copyright notice, this list of conditions and the following
22 * disclaimer in the documentation and/or other materials provided
23 * with the distribution.
24 *
25 * - Neither the name of the Eclipse Foundation, Inc. nor the
26 * names of its contributors may be used to endorse or promote
27 * products derived from this software without specific prior
28 * written permission.
29 *
30 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
31 * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
32 * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
33 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
34 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
35 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
36 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
37 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
38 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
39 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
40 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
41 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
42 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
43 */
44 package org.eclipse.jgit.merge;
45
46 import org.eclipse.jgit.lib.Config;
47 import org.eclipse.jgit.lib.ObjectInserter;
48 import org.eclipse.jgit.lib.Repository;
49
50 /**
51 * A three-way merge strategy performing a content-merge if necessary
52 */
53 public class StrategyResolve extends ThreeWayMergeStrategy {
54
55 /** {@inheritDoc} */
56 @Override
57 public ThreeWayMerger newMerger(Repository db) {
58 return new ResolveMerger(db, false);
59 }
60
61 /** {@inheritDoc} */
62 @Override
63 public ThreeWayMerger newMerger(Repository db, boolean inCore) {
64 return new ResolveMerger(db, inCore);
65 }
66
67 /** {@inheritDoc} */
68 @Override
69 public ThreeWayMerger newMerger(ObjectInserter inserter, Config config) {
70 return new ResolveMerger(inserter, config);
71 }
72
73 /** {@inheritDoc} */
74 @Override
75 public String getName() {
76 return "resolve"; //$NON-NLS-1$
77 }
78 }