public class MergeBlockedByConflictException extends RuntimeException
| Constructor and Description |
|---|
MergeBlockedByConflictException(Collection<Diff> conflictingDiffs)
Constructor.
|
| Modifier and Type | Method and Description |
|---|---|
Collection<Diff> |
getConflictingDiffs()
Get the conflicting diffs.
|
addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toStringpublic MergeBlockedByConflictException(Collection<Diff> conflictingDiffs)
conflictingDiffs - The diffs that depend on a conflictpublic Collection<Diff> getConflictingDiffs()
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.