Enum Class MergeResult.MergeStatus

java.lang.Object
java.lang.Enum<MergeResult.MergeStatus>
org.eclipse.jgit.api.MergeResult.MergeStatus
All Implemented Interfaces:
Serializable, Comparable<MergeResult.MergeStatus>, java.lang.constant.Constable
Enclosing class:
MergeResult

public static enum MergeResult.MergeStatus extends Enum<MergeResult.MergeStatus>
The status the merge resulted in.
  • Enum Constant Details

    • FAST_FORWARD

      public static final MergeResult.MergeStatus FAST_FORWARD
      Merge is a fast-forward
    • FAST_FORWARD_SQUASHED

      public static final MergeResult.MergeStatus FAST_FORWARD_SQUASHED
      Merge is a fast-forward, squashed
      Since:
      2.0
    • ALREADY_UP_TO_DATE

      public static final MergeResult.MergeStatus ALREADY_UP_TO_DATE
      Already up to date, merge was a no-op
    • FAILED

      public static final MergeResult.MergeStatus FAILED
      Merge failed
    • MERGED

      public static final MergeResult.MergeStatus MERGED
      Merged
    • MERGED_SQUASHED

      public static final MergeResult.MergeStatus MERGED_SQUASHED
      Merged, squashed, not updating HEAD
      Since:
      2.0
    • MERGED_SQUASHED_NOT_COMMITTED

      public static final MergeResult.MergeStatus MERGED_SQUASHED_NOT_COMMITTED
      Merged, squashed, not committed
      Since:
      3.0
    • CONFLICTING

      public static final MergeResult.MergeStatus CONFLICTING
      Merge raised conflicts to be resolved
    • ABORTED

      public static final MergeResult.MergeStatus ABORTED
      Merge was aborted
      Since:
      2.2
    • MERGED_NOT_COMMITTED

      public static final MergeResult.MergeStatus MERGED_NOT_COMMITTED
      Merged, not committed
      Since:
      3.0
    • NOT_SUPPORTED

      public static final MergeResult.MergeStatus NOT_SUPPORTED
      Not yet supported
    • CHECKOUT_CONFLICT

      public static final MergeResult.MergeStatus CHECKOUT_CONFLICT
      Status representing a checkout conflict, meaning that nothing could be merged, as the pre-scan for the trees already failed for certain files (i.e. local modifications prevent checkout of files).
  • Method Details

    • values

      public static MergeResult.MergeStatus[] 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 MergeResult.MergeStatus 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
    • isSuccessful

      public abstract boolean isSuccessful()
      Whether the merge was successful
      Returns:
      whether the status indicates a successful result