Package org.projectnessie.versioned

Class MergeConflictException

java.lang.Object

java.lang.Throwable

java.lang.Exception

org.projectnessie.versioned.VersionStoreException

org.projectnessie.versioned.ReferenceConflictException

org.projectnessie.versioned.MergeConflictException

All Implemented Interfaces:

java.io.Serializable

public class MergeConflictException
extends ReferenceConflictException

Special case of a ReferenceConflictException indicating that a non-dry-run merge or transplant operation could not be completed due to conflicts.

See Also:

Serialized Form

Constructor Summary

Constructors

Constructor	Description
MergeConflictException(java.lang.String message, MergeResult<?> mergeResult)

Method Summary

Modifier and Type	Method	Description
MergeResult<?>	getMergeResult()

Methods inherited from class org.projectnessie.versioned.ReferenceConflictException

getReferenceConflicts

Methods inherited from class java.lang.Throwable

addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, 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 Detail

MergeConflictException

public MergeConflictException(java.lang.String message,
                              MergeResult<?> mergeResult)

Method Detail

getMergeResult

public MergeResult<?> getMergeResult()