Package org.eclipse.jgit.api
Enum Class MergeCommand.ConflictStyle
- All Implemented Interfaces:
Serializable
,Comparable<MergeCommand.ConflictStyle>
,Constable
- Enclosing class:
- MergeCommand
Values for the "merge.conflictStyle" git config.
- Since:
- 5.12
-
Nested Class Summary
Nested classes/interfaces inherited from class java.lang.Enum
Enum.EnumDesc<E extends Enum<E>>
-
Enum Constant Summary
Enum Constants -
Constructor Summary
Constructors -
Method Summary
Modifier and TypeMethodDescriptionstatic MergeCommand.ConflictStyle
Returns the enum constant of this class with the specified name.static MergeCommand.ConflictStyle[]
values()
Returns an array containing the constants of this enum class, in the order they are declared.
-
Enum Constant Details
-
MERGE
"merge" style: only ours/theirs. This is the default. -
DIFF3
"diff3" style: ours/base/theirs.
-
-
Constructor Details
-
ConflictStyle
private ConflictStyle()
-
-
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
-