All Frameworks Object Hierarchy This Framework Indexes
CatConflictStatus (Enumeration)
enum CatConflictStatus {
catConflictStatusNotInspected,
catConflictStatusRelevant,
catConflictStatusIrrelevant,
catConflictStatusSolved
}
The different statuses of conflicts.
It is used by the Conflict object to specify the conflict status.
- Values:
-
- catConflictStatusNotInspected
- The conflict was not inspected since it was discovered.
- catConflictStatusRelevant
- The conflict was inspected and declared relevant by the user.
- catConflictStatusIrrelevant
- The conflict was inspected and declared irrelevant by the user.
- catConflictStatusSolved
- The conflict has been computed as SOLVED by the comparison soft