org.netbeans.libs.git

Enum GitMergeResult.MergeStatus

java.lang.Object

java.lang.Enum<GitMergeResult.MergeStatus>

org.netbeans.libs.git.GitMergeResult.MergeStatus

All Implemented Interfaces:

Serializable, Comparable<GitMergeResult.MergeStatus>

Enclosing class:

GitMergeResult

public static enum GitMergeResult.MergeStatus
extends Enum<GitMergeResult.MergeStatus>

The status the merge resulted in.

Enum Constant Summary

Enum Constants

Enum Constant and Description
ABORTED Fast forward merge cannot be executed, a commit is needed.
ALREADY_UP_TO_DATE
CONFLICTING
FAILED
FAST_FORWARD
MERGED
NOT_SUPPORTED

Method Summary

Modifier and Type	Method and Description
static GitMergeResult.MergeStatus	valueOf(String name) Returns the enum constant of this type with the specified name.
static GitMergeResult.MergeStatus[]	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

FAST_FORWARD

public static final GitMergeResult.MergeStatus FAST_FORWARD

ABORTED

public static final GitMergeResult.MergeStatus ABORTED

Fast forward merge cannot be executed, a commit is needed.

Since:

1.26

ALREADY_UP_TO_DATE

public static final GitMergeResult.MergeStatus ALREADY_UP_TO_DATE

FAILED

public static final GitMergeResult.MergeStatus FAILED

MERGED

public static final GitMergeResult.MergeStatus MERGED

CONFLICTING

public static final GitMergeResult.MergeStatus CONFLICTING

NOT_SUPPORTED

public static final GitMergeResult.MergeStatus NOT_SUPPORTED

Method Detail

values

public static GitMergeResult.MergeStatus[] values()

Returns:

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

valueOf

public static GitMergeResult.MergeStatus valueOf(String name)

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