public static enum ThreeWayMerge.ThreeWayResultPreset extends Enum<ThreeWayMerge.ThreeWayResultPreset>
ThreeWayMerge.ThreeWayMergeResultType
and RuleConfiguration
settings.Enum Constant and Description |
---|
ALL_CHANGES
Three to two way merge result will have all the possible changes represented in the output.
|
CONFLICTING_CHANGES
This result will have only conflicting changes.
|
THEIR_CHANGES
This result will show the changes by other person or the changes on the other branch.
|
Modifier and Type | Method and Description |
---|---|
static ThreeWayMerge.ThreeWayResultPreset |
valueOf(String name)
Returns the enum constant of this type with the specified name.
|
static ThreeWayMerge.ThreeWayResultPreset[] |
values()
Returns an array containing the constants of this enum type, in
the order they are declared.
|
public static final ThreeWayMerge.ThreeWayResultPreset ALL_CHANGES
public static final ThreeWayMerge.ThreeWayResultPreset CONFLICTING_CHANGES
public static final ThreeWayMerge.ThreeWayResultPreset THEIR_CHANGES
public static ThreeWayMerge.ThreeWayResultPreset[] values()
for (ThreeWayMerge.ThreeWayResultPreset c : ThreeWayMerge.ThreeWayResultPreset.values()) System.out.println(c);
public static ThreeWayMerge.ThreeWayResultPreset valueOf(String name)
name
- the name of the enum constant to be returned.IllegalArgumentException
- if this enum type has no constant with the specified nameNullPointerException
- if the argument is nullCopyright © 2015 - 2019 DeltaXML Ltd. All Rights Reserved.