org.eclipse.jgit.api

Enum MergeCommand.ConflictStyle

java.lang.Object

java.lang.Enum<MergeCommand.ConflictStyle>

org.eclipse.jgit.api.MergeCommand.ConflictStyle

All Implemented Interfaces:

Serializable, Comparable<MergeCommand.ConflictStyle>

Enclosing class:

MergeCommand

public static enum MergeCommand.ConflictStyle
extends Enum<MergeCommand.ConflictStyle>

Values for the "merge.conflictStyle" git config.

Since:

5.12

Enum Constant Summary

Enum Constants

Enum Constant and Description
DIFF3 "diff3" style: ours/base/theirs.
MERGE "merge" style: only ours/theirs.

Method Summary

Modifier and Type	Method and Description
static MergeCommand.ConflictStyle	valueOf(String name) Returns the enum constant of this type with the specified name.
static MergeCommand.ConflictStyle[]	values() Returns an array containing the constants of this enum type, in the order they are declared.

Methods inherited from class java.lang.Enum

clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf

Methods inherited from class java.lang.Object

getClass, notify, notifyAll, wait, wait, wait

Enum Constant Detail

MERGE

public static final MergeCommand.ConflictStyle MERGE

"merge" style: only ours/theirs. This is the default.

DIFF3

public static final MergeCommand.ConflictStyle DIFF3

"diff3" style: ours/base/theirs.

Method Detail

values

public static MergeCommand.ConflictStyle[] values()

Returns an array containing the constants of this enum type, in the order they are declared. This method may be used to iterate over the constants as follows:

for (MergeCommand.ConflictStyle c : MergeCommand.ConflictStyle.values())
    System.out.println(c);

Returns:

an array containing the constants of this enum type, in the order they are declared

valueOf

public static MergeCommand.ConflictStyle valueOf(String name)

Returns the enum constant of this type with the specified name. The string must match exactly an identifier used to declare an enum constant in this type. (Extraneous whitespace characters are not permitted.)

Parameters:

name - the name of the enum constant to be returned.

Returns:

the enum constant with the specified name

Throws:

IllegalArgumentException - if this enum type has no constant with the specified name

NullPointerException - if the argument is null