| Modifier and Type | Class and Description |
|---|---|
| public static enum | NoMergeBaseException.
An enum listing the different reason why no merge base could be determined. |
| Modifier and Type | Field and Description |
|---|---|
| private NoMergeBaseException. | |
| private static final long |
| Access | Constructor and Description |
|---|---|
| public | NoMergeBaseException(NoMergeBaseException.
the reason why no merge base could be found reason,a text describing the problem message)Construct a NoMergeBase exception |
| public | NoMergeBaseException(NoMergeBaseException.
the reason why no merge base could be found reason,a text describing the problem message, Throwable an exception causing this error why)Construct a NoMergeBase exception |
| Modifier and Type | Method and Description |
|---|---|
| public NoMergeBaseException. | Returns: the reason why no merge base could be foundGet the reason why no merge base could be found |
| reason | back to summary |
|---|---|
| private NoMergeBaseException. | |
| serialVersionUID | back to summary |
|---|---|
| private static final long serialVersionUID | |
| NoMergeBaseException | back to summary |
|---|---|
| public NoMergeBaseException(NoMergeBaseException. Construct a NoMergeBase exception
| |
| NoMergeBaseException | back to summary |
|---|---|
| public NoMergeBaseException(NoMergeBaseException. Construct a NoMergeBase exception
| |
| getReason | back to summary |
|---|---|
| public NoMergeBaseException. Get the reason why no merge base could be found
| |
| Modifier and Type | Field and Description |
|---|---|
| public static final NoMergeBaseException. | CONFLICTS_DURING_MERGE_BASE_CALCULATION
In order to find a single merge base it may required to merge together multiple common predecessors. |
| public static final NoMergeBaseException. | MULTIPLE_MERGE_BASES_NOT_SUPPORTED
Multiple merge bases have been found (e.g. the commits to be merged have multiple common predecessors) but the merge strategy doesn't support this (e.g. ResolveMerge) |
| public static final NoMergeBaseException. | TOO_MANY_MERGE_BASES
The number of merge bases exceeds |
| Access | Constructor and Description |
|---|---|
| private |
| Modifier and Type | Method and Description |
|---|---|
| public static NoMergeBaseException. | |
| public static NoMergeBaseException. |
| CONFLICTS_DURING_MERGE_BASE_CALCULATION | back to summary |
|---|---|
| public static final NoMergeBaseException. In order to find a single merge base it may required to merge together multiple common predecessors. If during these merges conflicts occur the merge fails with this reason | |
| MULTIPLE_MERGE_BASES_NOT_SUPPORTED | back to summary |
|---|---|
| public static final NoMergeBaseException. Multiple merge bases have been found (e.g. the commits to be merged have multiple common predecessors) but the merge strategy doesn't support this (e.g. ResolveMerge) | |
| TOO_MANY_MERGE_BASES | back to summary |
|---|---|
| public static final NoMergeBaseException. The number of merge bases exceeds | |
| MergeBaseFailureReason | back to summary |
|---|---|
| private MergeBaseFailureReason() | |
| valueOf | back to summary |
|---|---|
| public static NoMergeBaseException. | |
| values | back to summary |
|---|---|
| public static NoMergeBaseException. | |