public final class GitMergeResult extends Object
Modifier and Type | Class and Description |
---|---|
static class |
GitMergeResult.MergeStatus
The status the merge resulted in.
|
Modifier and Type | Method and Description |
---|---|
String |
getBase() |
Collection<File> |
getConflicts()
If the merge started but was unable to finish because of unresolved conflicts then the method
returns a collection of such files in conflict.
|
Collection<File> |
getFailures()
When the merge fails because of local modifications then this
method returns a collections of files causing the failure.
|
String[] |
getMergedCommits() |
GitMergeResult.MergeStatus |
getMergeStatus() |
String |
getNewHead() |
public GitMergeResult.MergeStatus getMergeStatus()
public String getBase()
null
if the result was produced without
computing a common basepublic String[] getMergedCommits()
public String getNewHead()
null
if the merge failed.public Collection<File> getConflicts()
public Collection<File> getFailures()