Package ro.sync.merge
Enum Class MergeConflictResolutionMethods
- All Implemented Interfaces:
Serializable
,Comparable<MergeConflictResolutionMethods>
,Constable
@API(type=NOT_EXTENDABLE,
src=PUBLIC)
public enum MergeConflictResolutionMethods
extends Enum<MergeConflictResolutionMethods>
Possible methods of dealing with conflicts when auto-merging files.
- Since:
- 18.0
-
Nested Class Summary
Nested classes/interfaces inherited from class java.lang.Enum
Enum.EnumDesc<E extends Enum<E>>
-
Enum Constant Summary
Enum ConstantsEnum ConstantDescriptionConflicts will be resolved by using the original version of a file.Conflicts will be resolved by using the left version of a file.Conflicts will be resolved by using the right version of a file. -
Method Summary
Modifier and TypeMethodDescriptionReturns the enum constant of this class with the specified name.static MergeConflictResolutionMethods[]
values()
Returns an array containing the constants of this enum class, in the order they are declared.
-
Enum Constant Details
-
USE_LEFT
Conflicts will be resolved by using the left version of a file. -
USE_RIGHT
Conflicts will be resolved by using the right version of a file. -
USE_ANCESTOR
Conflicts will be resolved by using the original version of a file.
-
-
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
-