Package org.apache.subversion.javahl
Enum ConflictResult.Choice
- java.lang.Object
-
- java.lang.Enum<ConflictResult.Choice>
-
- org.apache.subversion.javahl.ConflictResult.Choice
-
- All Implemented Interfaces:
java.io.Serializable
,java.lang.Comparable<ConflictResult.Choice>
- Enclosing class:
- ConflictResult
public static enum ConflictResult.Choice extends java.lang.Enum<ConflictResult.Choice>
-
-
Enum Constant Summary
Enum Constants Enum Constant Description chooseBase
Resolve the conflict by choosing the base file.chooseMerged
Resolve the conflict by choosing the merged object (potentially manually edited).chooseMineConflict
Resolve the conflict by choosing own (local) version of the object (for conflicted hunks only).chooseMineFull
Resolve the conflict by choosing own (local) version of the object.chooseTheirsConflict
Resolve the conflict by choosing the incoming (repository) version of the object (for conflicted hunks only).chooseTheirsFull
Resolve the conflict by choosing the incoming (repository) version of the object.postpone
Nothing done to resolve the conflict; conflict remains.
-
Method Summary
All Methods Static Methods Concrete Methods Modifier and Type Method Description static ConflictResult.Choice
valueOf(java.lang.String name)
Returns the enum constant of this type with the specified name.static ConflictResult.Choice[]
values()
Returns an array containing the constants of this enum type, in the order they are declared.
-
-
-
Enum Constant Detail
-
postpone
public static final ConflictResult.Choice postpone
Nothing done to resolve the conflict; conflict remains.
-
chooseBase
public static final ConflictResult.Choice chooseBase
Resolve the conflict by choosing the base file.
-
chooseTheirsFull
public static final ConflictResult.Choice chooseTheirsFull
Resolve the conflict by choosing the incoming (repository) version of the object.
-
chooseMineFull
public static final ConflictResult.Choice chooseMineFull
Resolve the conflict by choosing own (local) version of the object.
-
chooseTheirsConflict
public static final ConflictResult.Choice chooseTheirsConflict
Resolve the conflict by choosing the incoming (repository) version of the object (for conflicted hunks only).
-
chooseMineConflict
public static final ConflictResult.Choice chooseMineConflict
Resolve the conflict by choosing own (local) version of the object (for conflicted hunks only).
-
chooseMerged
public static final ConflictResult.Choice chooseMerged
Resolve the conflict by choosing the merged object (potentially manually edited).
-
-
Method Detail
-
values
public static ConflictResult.Choice[] values()
Returns an array containing the constants of this enum type, in the order they are declared. This method may be used to iterate over the constants as follows:for (ConflictResult.Choice c : ConflictResult.Choice.values()) System.out.println(c);
- Returns:
- an array containing the constants of this enum type, in the order they are declared
-
valueOf
public static ConflictResult.Choice valueOf(java.lang.String name)
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:
java.lang.IllegalArgumentException
- if this enum type has no constant with the specified namejava.lang.NullPointerException
- if the argument is null
-
-