Package | Description |
---|---|
org.eclipse.jgit.api |
High-level API commands (the porcelain of JGit).
|
Modifier and Type | Field and Description |
---|---|
private MergeResult.MergeStatus |
MergeResult.mergeStatus |
Modifier and Type | Method and Description |
---|---|
MergeResult.MergeStatus |
MergeResult.getMergeStatus()
Get the merge status
|
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)
Constructor for MergeResult.
|
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)
Constructor for MergeResult.
|
MergeResult(ObjectId newHead,
ObjectId base,
ObjectId[] mergedCommits,
MergeResult.MergeStatus mergeStatus,
MergeStrategy mergeStrategy,
java.util.Map<java.lang.String,MergeResult<?>> lowLevelResults,
java.lang.String description)
Constructor for MergeResult.
|