Package ro.sync.merge

Enum MergeConflictResolutionMethods

  • All Implemented Interfaces:
    java.io.Serializable, java.lang.Comparable<MergeConflictResolutionMethods>
    @API(type=NOT_EXTENDABLE,
     src=PUBLIC)
public enum MergeConflictResolutionMethods
extends java.lang.Enum<MergeConflictResolutionMethods>
    Possible methods of dealing with conflicts when auto-merging files.
    Since:
    18.0

    • Enum Constant Summary

      Enum Constants 
      Enum Constant Description
      USE_ANCESTOR
      Conflicts will be resolved by using the original version of a file.
      USE_LEFT
      Conflicts will be resolved by using the left version of a file.
      USE_RIGHT
      Conflicts will be resolved by using the right version of a file.

    • Method Summary

      All Methods Static Methods Concrete Methods 
      Modifier and Type Method Description
      static MergeConflictResolutionMethods valueOf​(java.lang.String name)
      Returns the enum constant of this type with the specified name.
      static MergeConflictResolutionMethods[] values()
      Returns an array containing the constants of this enum type, in the order they are declared.

      • Methods inherited from class java.lang.Enum

        clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf

      • Methods inherited from class java.lang.Object

        getClass, notify, notifyAll, wait, wait, wait

    • Method Detail

      • values

        public static MergeConflictResolutionMethods[] values()
        Returns an array containing the constants of this enum type, in the order they are declared. This method may be used to iterate over the constants as follows: 
        for (MergeConflictResolutionMethods c : MergeConflictResolutionMethods.values())
    System.out.println(c);
        Returns:
        an array containing the constants of this enum type, in the order they are declared

      • valueOf

        public static MergeConflictResolutionMethods valueOf​(java.lang.String name)
        Returns the enum constant of this type with the specified name. The string must match exactly an identifier used to declare an enum constant in this type. (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:
        java.lang.IllegalArgumentException - if this enum type has no constant with the specified name
        java.lang.NullPointerException - if the argument is null