Class MergeException

All Implemented Interfaces:
Serializable

public class MergeException extends ScmException
See Also:
  • Constructor Details

    • MergeException

      public MergeException(@Nonnull KeyedMessage message, @Nonnull String scmId, @Nonnull Repository repository, @Nonnull String from, @Nonnull String to, boolean conflicted)
      Parameters:
      message - message
      scmId - ID of the scm
      repository - repository
      from - from hash
      to - to hash
      conflicted - true if conflicted
      Since:
      5.0
    • MergeException

      public MergeException(@Nonnull KeyedMessage message, @Nullable Throwable cause, @Nonnull String scmId, @Nonnull Repository repository, @Nonnull String from, @Nonnull String to, boolean conflicted)
      Parameters:
      message - message
      cause - cause or null
      scmId - ID of the scm
      repository - repository
      from - from hash
      to - to hash
      conflicted - true if conflicted
      Since:
      5.0
  • Method Details

    • getFrom

      @Nonnull public String getFrom()
    • getRepository

      @Nonnull public Repository getRepository()
    • getTo

      @Nonnull public String getTo()
    • isConflicted

      public boolean isConflicted()
      Returns:
      true if the merge failed because the resulting merge had conflicts
      Since:
      5.0