Package | Description |
---|---|
org.eclipse.jgit.api |
Modifier and Type | Method and Description |
---|---|
MergeResult.MergeStatus |
MergeResult.getMergeStatus() |
static MergeResult.MergeStatus |
MergeResult.MergeStatus.valueOf(java.lang.String name)
Returns the enum constant of this type with the specified name.
|
static MergeResult.MergeStatus[] |
MergeResult.MergeStatus.values()
Returns an array containing the constants of this enum type, in
the order they are declared.
|
Constructor and Description |
---|
MergeResult(ObjectId newHead,
ObjectId base,
ObjectId[] mergedCommits,
MergeResult.MergeStatus mergeStatus,
MergeStrategy mergeStrategy,
java.util.Map<java.lang.String,MergeResult<?>> lowLevelResults) |
MergeResult(ObjectId newHead,
ObjectId base,
ObjectId[] mergedCommits,
MergeResult.MergeStatus mergeStatus,
MergeStrategy mergeStrategy,
java.util.Map<java.lang.String,MergeResult<?>> lowLevelResults,
java.util.Map<java.lang.String,ResolveMerger.MergeFailureReason> failingPaths,
java.lang.String description) |
MergeResult(ObjectId newHead,
ObjectId base,
ObjectId[] mergedCommits,
MergeResult.MergeStatus mergeStatus,
MergeStrategy mergeStrategy,
java.util.Map<java.lang.String,MergeResult<?>> lowLevelResults,
java.lang.String description) |
Copyright © 2012. All Rights Reserved.