Example usage for Java org.eclipse.jgit.api MergeResult fields, constructors, methods, implement or subclass
The text is from its open source code.
MergeResult(List Creates a new result that represents a checkout conflict before the operation even started for real. | |
MergeResult(ObjectId newHead, ObjectId base, ObjectId[] mergedCommits, MergeStatus mergeStatus, MergeStrategy mergeStrategy, Map Constructor for MergeResult. |
List | getCheckoutConflicts() Returns a list of paths that cause a checkout conflict. |
Map | getConflicts() Returns information about the conflicts which occurred during a org.eclipse.jgit.api.MergeCommand . |
Map | getFailingPaths() Returns a list of paths causing this merge to fail as returned by org.eclipse.jgit.merge.ResolveMerger#getFailingPaths() |
ObjectId[] | getMergedCommits() Get the commits which have been merged |
MergeStatus | getMergeStatus() Get the merge status |
ObjectId | getNewHead() Get the object the head points at after the merge |