org.netbeans.libs.git
Class GitMergeResult

java.lang.Object
  org.netbeans.libs.git.GitMergeResult

public final class GitMergeResult
extends Object

Returned by a git merge command, represents its result.

Nested Class Summary

static class

GitMergeResult.MergeStatus The status the merge resulted in.

Method Summary

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()

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Method Detail

getMergeStatus

public GitMergeResult.MergeStatus getMergeStatus()

Returns:

result of the merge.

getBase

public String getBase()

Returns:

the common base which was used to produce a content-merge. May be null if the result was produced without computing a common base

getMergedCommits

public String[] getMergedCommits()

Returns:

ids of commits merged

getNewHead

public String getNewHead()

Returns:

current HEAD commit after the successful merge or null if the merge failed.

getConflicts

public 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. To complete the merge you need to resolve the conflicts and commit the changes.

Returns:

files in conflict

getFailures

public Collection<File> getFailures()

When the merge fails because of local modifications then this method returns a collections of files causing the failure.

Returns:

files that cause the merge to fail.