Package | Description |
---|---|
org.eclipse.jgit.api |
High-level API commands (the porcelain of JGit).
|
org.eclipse.jgit.merge |
Content and commit history merge algorithms.
|
Modifier and Type | Method and Description |
---|---|
Map<String,ResolveMerger.MergeFailureReason> |
RebaseResult.getFailingPaths()
Get the list of paths causing this rebase to fail
|
Map<String,ResolveMerger.MergeFailureReason> |
MergeResult.getFailingPaths()
Returns a list of paths causing this merge to fail as returned by
ResolveMerger.getFailingPaths() |
Map<String,ResolveMerger.MergeFailureReason> |
CherryPickResult.getFailingPaths()
Get the list of paths causing this cherry-pick to fail
|
Constructor and Description |
---|
CherryPickResult(Map<String,ResolveMerger.MergeFailureReason> failingPaths)
Constructor for CherryPickResult
|
MergeResult(ObjectId newHead,
ObjectId base,
ObjectId[] mergedCommits,
MergeResult.MergeStatus mergeStatus,
MergeStrategy mergeStrategy,
Map<String,MergeResult<?>> lowLevelResults,
Map<String,ResolveMerger.MergeFailureReason> failingPaths,
String description)
Constructor for MergeResult.
|
Modifier and Type | Field and Description |
---|---|
protected Map<String,ResolveMerger.MergeFailureReason> |
ResolveMerger.failingPaths
Paths for which the merge failed altogether.
|
Modifier and Type | Method and Description |
---|---|
static ResolveMerger.MergeFailureReason |
ResolveMerger.MergeFailureReason.valueOf(String name)
Returns the enum constant of this type with the specified name.
|
static ResolveMerger.MergeFailureReason[] |
ResolveMerger.MergeFailureReason.values()
Returns an array containing the constants of this enum type, in
the order they are declared.
|
Modifier and Type | Method and Description |
---|---|
Map<String,ResolveMerger.MergeFailureReason> |
ResolveMerger.getFailingPaths()
Get list of paths causing this merge to fail (not stopped because of a
conflict).
|
Copyright © 2019 Eclipse JGit Project. All rights reserved.