- All Implemented Interfaces:
Serializable
,Comparable<MergeResult.MergeStatus>
,java.lang.constant.Constable
- Enclosing class:
- MergeResult
The status the merge resulted in.
-
Nested Class Summary
Nested classes/interfaces inherited from class java.lang.Enum
Enum.EnumDesc<E extends Enum<E>>
-
Enum Constant Summary
Enum ConstantsEnum ConstantDescriptionMerge was abortedAlready up to date, merge was a no-opStatus representing a checkout conflict, meaning that nothing could be merged, as the pre-scan for the trees already failed for certain files (i.e.Merge raised conflicts to be resolvedMerge failedMerge is a fast-forwardMerge is a fast-forward, squashedMergedMerged, not committedMerged, squashed, not updating HEADMerged, squashed, not committedNot yet supported -
Method Summary
Modifier and TypeMethodDescriptionabstract boolean
Whether the merge was successfulstatic MergeResult.MergeStatus
Returns the enum constant of this class with the specified name.static MergeResult.MergeStatus[]
values()
Returns an array containing the constants of this enum class, in the order they are declared.
-
Enum Constant Details
-
FAST_FORWARD
Merge is a fast-forward -
FAST_FORWARD_SQUASHED
Merge is a fast-forward, squashed- Since:
- 2.0
-
ALREADY_UP_TO_DATE
Already up to date, merge was a no-op -
FAILED
Merge failed -
MERGED
Merged -
MERGED_SQUASHED
Merged, squashed, not updating HEAD- Since:
- 2.0
-
MERGED_SQUASHED_NOT_COMMITTED
Merged, squashed, not committed- Since:
- 3.0
-
CONFLICTING
Merge raised conflicts to be resolved -
ABORTED
Merge was aborted- Since:
- 2.2
-
MERGED_NOT_COMMITTED
Merged, not committed- Since:
- 3.0
-
NOT_SUPPORTED
Not yet 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).
-
-
Method Details
-
values
Returns an array containing the constants of this enum class, in the order they are declared.- Returns:
- an array containing the constants of this enum class, in the order they are declared
-
valueOf
Returns the enum constant of this class with the specified name. The string must match exactly an identifier used to declare an enum constant in this class. (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 class has no constant with the specified nameNullPointerException
- if the argument is null
-
isSuccessful
public abstract boolean isSuccessful()Whether the merge was successful- Returns:
- whether the status indicates a successful result
-