Enum Constant Summary
Enum Constants
Exists in ours and theirs, but not in base.
Exists in base, but neither in ours nor in theirs.
Exists in all stages, content conflict.
Exists in base and ours, but no in theirs.
Exists in base and theirs, but not in ours.
Method Summary
All Methods Static Methods Instance Methods Concrete Methods
boolean
boolean
boolean
boolean
boolean
boolean
boolean
boolean
boolean
Returns the enum constant of this class with the specified name.
Returns an array containing the constants of this enum class, in
the order they are declared.
Methods inherited from class java.lang.Enum
clone , compareTo , describeConstable , equals , finalize , getDeclaringClass , hashCode , name , ordinal , toString , valueOf
Enum Constant Details
BOTH_DELETED
Exists in base, but neither in ours nor in theirs.
ADDED_BY_US
Only exists in ours.
DELETED_BY_THEM
Exists in base and ours, but no in theirs.
ADDED_BY_THEM
Only exists in theirs.
DELETED_BY_US
Exists in base and theirs, but not in ours.
BOTH_ADDED
Exists in ours and theirs, but not in base.
BOTH_MODIFIED
Exists in all stages, content conflict.
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 name
NullPointerException
- if the argument is null
hasBase
public boolean hasBase ()
Returns:
whether there is a "base" stage entry
hasOurs
public boolean hasOurs ()
Returns:
whether there is an "ours" stage entry
hasTheirs
public boolean hasTheirs ()
Returns:
whether there is a "theirs" stage entry
isModifiedByOurs
public boolean isModifiedByOurs ()
Returns:
whether exists in "base" and "ours"
isModifiedByTheirs
public boolean isModifiedByTheirs ()
Returns:
whether exists in "base" and "theirs"
isAddedByOurs
public boolean isAddedByOurs ()
Returns:
whether exists in "ours", but no in "base".
isAddedByTheirs
public boolean isAddedByTheirs ()
Returns:
whether exists in "theirs", but no in "base".
isRemovedByOurs
public boolean isRemovedByOurs ()
Returns:
whether exists in "base", but no in "ours".
isRemovedByTheirs
public boolean isRemovedByTheirs ()
Returns:
whether exists in "base", but no in "theirs".