Package org.eclipse.jgit.merge
Enum MergeChunk.ConflictState
- All Implemented Interfaces:
Serializable
,Comparable<MergeChunk.ConflictState>
- Enclosing class:
MergeChunk
A state telling whether a MergeChunk belongs to a conflict or not. The
first chunk of a conflict is reported with a special state to be able to
distinguish the border between two consecutive conflicts
-
Enum Constant Summary
Enum ConstantsEnum ConstantDescriptionThis chunk does belong to a conflict and is the first one of the conflicting chunksThis chunk does belong to a conflict but is not the first one of the conflicting chunks.This chunk does not belong to a conflict -
Constructor Summary
Constructors -
Method Summary
Modifier and TypeMethodDescriptionstatic MergeChunk.ConflictState
Returns the enum constant of this type with the specified name.static MergeChunk.ConflictState[]
values()
Returns an array containing the constants of this enum type, in the order they are declared.
-
Enum Constant Details
-
NO_CONFLICT
This chunk does not belong to a conflict -
FIRST_CONFLICTING_RANGE
This chunk does belong to a conflict and is the first one of the conflicting chunks -
NEXT_CONFLICTING_RANGE
This chunk does belong to a conflict but is not the first one of the conflicting chunks. It's a subsequent one.
-
-
Constructor Details
-
ConflictState
private ConflictState()
-
-
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
-