Package com.atlassian.bitbucket.scm.git.command.merge

Class GitMergeException

java.lang.Object

java.lang.Throwable

java.lang.Exception

java.lang.RuntimeException

com.atlassian.bitbucket.ServiceException

com.atlassian.bitbucket.scm.git.GitException

com.atlassian.bitbucket.scm.git.command.merge.GitMergeException

All Implemented Interfaces:

Serializable

Direct Known Subclasses:

GitMergeStrategyException

public class GitMergeException
extends GitException

See Also:

• Serialized Form

Constructor Summary

Constructors

Constructor	Description
GitMergeException(com.atlassian.bitbucket.i18n.KeyedMessage message)
GitMergeException(com.atlassian.bitbucket.i18n.KeyedMessage message, Throwable cause)
GitMergeException(com.atlassian.bitbucket.i18n.KeyedMessage message, List<GitMergeConflict> conflicts)

Method Summary

Modifier and Type	Method	Description
List<GitMergeConflict>	getConflicts()

Methods inherited from class com.atlassian.bitbucket.ServiceException

getKeyedMessage, getLocalizedMessage, getMessageKey

Methods inherited from class java.lang.Throwable

addSuppressed, fillInStackTrace, getCause, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait

Constructor Details

GitMergeException

public GitMergeException(@Nonnull
 com.atlassian.bitbucket.i18n.KeyedMessage message)

GitMergeException

public GitMergeException(@Nonnull
 com.atlassian.bitbucket.i18n.KeyedMessage message,
 @Nonnull
 List<GitMergeConflict> conflicts)

GitMergeException

public GitMergeException(@Nonnull
 com.atlassian.bitbucket.i18n.KeyedMessage message,
 @Nullable
 Throwable cause)

Parameters:

message - the message for the exception

cause - an optional cause for this exception

Method Details

getConflicts

@Nonnull
public List<GitMergeConflict> getConflicts()