Package org.eclipse.jgit.api
Enum MergeResult.MergeStatus
- All Implemented Interfaces:
Serializable
,Comparable<MergeResult.MergeStatus>
- Enclosing class:
MergeResult
The status the merge resulted in.
-
Enum Constant Summary
Enum ConstantsEnum ConstantDescriptionStatus representing a checkout conflict, meaning that nothing could be merged, as the pre-scan for the trees already failed for certain files (i.e. -
Constructor Summary
Constructors -
Method Summary
Modifier and TypeMethodDescriptionabstract boolean
static MergeResult.MergeStatus
Returns the enum constant of this type with the specified name.static MergeResult.MergeStatus[]
values()
Returns an array containing the constants of this enum type, in the order they are declared.
-
Enum Constant Details
-
FAST_FORWARD
-
FAST_FORWARD_SQUASHED
- Since:
- 2.0
-
ALREADY_UP_TO_DATE
-
FAILED
-
MERGED
-
MERGED_SQUASHED
- Since:
- 2.0
-
MERGED_SQUASHED_NOT_COMMITTED
- Since:
- 3.0
-
CONFLICTING
-
ABORTED
- Since:
- 2.2
-
MERGED_NOT_COMMITTED
- Since:
- 3.0
-
NOT_SUPPORTED
-
CHECKOUT_CONFLICT
Status representing a checkout conflict, meaning that nothing could be merged, as the pre-scan for the trees already failed for certain files (i.e. local modifications prevent checkout of files).
-
-
Constructor Details
-
MergeStatus
private MergeStatus()
-
-
Method Details
-
values
Returns an array containing the constants of this enum type, in the order they are declared.- Returns:
- an array containing the constants of this enum type, in the order they are declared
-
valueOf
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 nameNullPointerException
- if the argument is null
-
isSuccessful
public abstract boolean isSuccessful()- Returns:
- whether the status indicates a successful result
-