Package sonia.scm.repository.api
Enum Class MergePreventReasonType
- All Implemented Interfaces:
Serializable
,Comparable<MergePreventReasonType>
,Constable
- Since:
- 3.3.0
-
Nested Class Summary
Nested classes/interfaces inherited from class java.lang.Enum
Enum.EnumDesc<E extends Enum<E>>
-
Enum Constant Summary
Enum ConstantsEnum ConstantDescriptionIt is also possible that we cannot perform a merge properly because files would be affected which have to be merged by an external merge tool.File conflicts are the typical reason why merges are not possible. -
Method Summary
Modifier and TypeMethodDescriptionstatic MergePreventReasonType
Returns the enum constant of this class with the specified name.static MergePreventReasonType[]
values()
Returns an array containing the constants of this enum class, in the order they are declared.
-
Enum Constant Details
-
FILE_CONFLICTS
File conflicts are the typical reason why merges are not possible. Common examples are: - File added on both branches - File modified on one branch but deleted on the other - File modified on both branches Reference:MergeConflictResult.ConflictTypes
-
EXTERNAL_MERGE_TOOL
It is also possible that we cannot perform a merge properly because files would be affected which have to be merged by an external merge tool. For git these merge tools are configured in the .gitattributes file inside the repository.
-
-
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
-