Top Description Fields Constructors Methods
org.eclipse.jgit.submodule

public Class SubmoduleConflict

extends Sequence
Class Inheritance
Imports
org.eclipse.jgit.diff.Sequence, org.eclipse.jgit.lib.ObjectId

Merges expect that conflicts will consist of Sequences, but that doesn't really make sense for submodules. So this represents a submodule conflict.
Since
4.11

Field Summary

Modifier and TypeField and Description
private final ObjectId

Constructor Summary

AccessConstructor and Description
public
SubmoduleConflict(ObjectId
the id of the object to create a submodule conflict for
objectId
)

Create a SubmoduleConflict for the given submodule object id

Method Summary

Modifier and TypeMethod and Description
public ObjectId

Returns:

the object id for the conflicting submodule
getObjectId
()

Get objectId for the conflicting submodule

public int
size()

Implements abstract org.eclipse.jgit.diff.Sequence.size.

Get size

Field Detail

objectIdback to summary
private final ObjectId objectId

Constructor Detail

SubmoduleConflictback to summary
public SubmoduleConflict(ObjectId objectId)

Create a SubmoduleConflict for the given submodule object id

Parameters
objectId:ObjectId

the id of the object to create a submodule conflict for

Method Detail

getObjectIdback to summary
public ObjectId getObjectId()

Get objectId for the conflicting submodule

Returns:ObjectId

the object id for the conflicting submodule

sizeback to summary
public int size()

Implements abstract org.eclipse.jgit.diff.Sequence.size.

Doc from org.eclipse.jgit.diff.Sequence.size.

Get size

Returns:int

size

Annotations
@Override