Enum Class ConflictResolution

java.lang.Object
java.lang.Enum<ConflictResolution>
com.nomagic.magicdraw.merge.ConflictResolution
All Implemented Interfaces:
Serializable, Comparable<ConflictResolution>, Constable

@OpenApiAll public enum ConflictResolution extends Enum<ConflictResolution>
Conflict resolution for 3-way merge.
  • Enum Constant Details

    • TARGET_PREFERRED

      public static final ConflictResolution TARGET_PREFERRED
      Prefer target changes if conflicts are detected.
    • SOURCE_PREFERRED

      public static final ConflictResolution SOURCE_PREFERRED
      Prefer source changes if conflicts are detected.
    • NOT_ALLOWED

      public static final ConflictResolution NOT_ALLOWED
      Do not allow conflicts.
  • Method Details

    • values

      public static ConflictResolution[] 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

      public static ConflictResolution valueOf(String name)
      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