Enum ContentMergeStrategy

  • All Implemented Interfaces:
    java.io.Serializable, java.lang.Comparable<ContentMergeStrategy>

    public enum ContentMergeStrategy
    extends java.lang.Enum<ContentMergeStrategy>
    How to handle content conflicts.
    Since:
    5.12
    • Enum Constant Summary

      Enum Constants 
      Enum Constant Description
      CONFLICT
      Produce a conflict.
      OURS
      Resolve the conflict hunk using the ours version.
      THEIRS
      Resolve the conflict hunk using the theirs version.
    • Method Summary

      All Methods Static Methods Concrete Methods 
      Modifier and Type Method Description
      static ContentMergeStrategy valueOf​(java.lang.String name)
      Returns the enum constant of this type with the specified name.
      static ContentMergeStrategy[] 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
    • Constructor Detail

      • ContentMergeStrategy

        private ContentMergeStrategy()
    • Method Detail

      • values

        public static ContentMergeStrategy[] 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 (ContentMergeStrategy c : ContentMergeStrategy.values())
            System.out.println(c);
        
        Returns:
        an array containing the constants of this enum type, in the order they are declared
      • valueOf

        public static ContentMergeStrategy 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