1 /*
2 * Copyright (C) 2021, Thomas Wolf <thomas.wolf@paranor.ch> and others
3 *
4 * This program and the accompanying materials are made available under the
5 * terms of the Eclipse Distribution License v. 1.0 which is available at
6 * https://www.eclipse.org/org/documents/edl-v10.php.
7 *
8 * SPDX-License-Identifier: BSD-3-Clause
9 */
10 package org.eclipse.jgit.merge;
11
12 /**
13 * How to handle content conflicts.
14 *
15 * @since 5.12
16 */
17 public enum ContentMergeStrategy {
18
19 /** Produce a conflict. */
20 CONFLICT,
21
22 /** Resolve the conflict hunk using the ours version. */
23 OURS,
24
25 /** Resolve the conflict hunk using the theirs version. */
26 THEIRS
27 }