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

Class GitEmptyRebaseBeforeMergeException

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

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

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

All Implemented Interfaces:

Serializable

public class GitEmptyRebaseBeforeMergeException
extends GitMergeStrategyException

An exception that is thrown when the merge could not be completed because the target branch includes identical changes and the rebase discarded all the incoming commits.

Since:

8.14

See Also:

• Serialized Form

Constructor Summary

Constructors

Constructor	Description
GitEmptyRebaseBeforeMergeException(com.atlassian.bitbucket.i18n.KeyedMessage message)

Method Summary

Methods inherited from class com.atlassian.bitbucket.scm.git.command.merge.GitMergeException

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

GitEmptyRebaseBeforeMergeException

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