public static enum ConflictResult.Choice extends java.lang.Enum<ConflictResult.Choice>
Enum Constant and 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.
|
Modifier and Type | Method and 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.
|
public static final ConflictResult.Choice postpone
public static final ConflictResult.Choice chooseBase
public static final ConflictResult.Choice chooseTheirsFull
public static final ConflictResult.Choice chooseMineFull
public static final ConflictResult.Choice chooseTheirsConflict
public static final ConflictResult.Choice chooseMineConflict
public static final ConflictResult.Choice chooseMerged
public static ConflictResult.Choice[] values()
for (ConflictResult.Choice c : ConflictResult.Choice.values()) System.out.println(c);
public static ConflictResult.Choice valueOf(java.lang.String name)
name
- the name of the enum constant to be returned.java.lang.IllegalArgumentException
- if this enum type has no constant with the specified namejava.lang.NullPointerException
- if the argument is null