org.netbeans.libs.git

Class GitConflictDescriptor

java.lang.Object

org.netbeans.libs.git.GitConflictDescriptor

public final class GitConflictDescriptor
extends Object

When there is a merge conflict in a file from a repository, the file's status provides instance of this class and you can get more information about the conflict. Can be acquired with GitStatus.getConflictDescriptor() method.

Nested Class Summary

Nested Classes

Modifier and Type	Class and Description
static class	GitConflictDescriptor.Type

Method Summary

Methods

Modifier and Type	Method and Description
GitConflictDescriptor.Type	getType()

Methods inherited from class java.lang.Object

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

Method Detail

getType

public GitConflictDescriptor.Type getType()

Returns:

type of the merge conflict