java.lang.Object
org.eclipse.jgit.diff.Sequence
org.eclipse.jgit.submodule.SubmoduleConflict
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
-
Constructor Summary
ConstructorsConstructorDescriptionSubmoduleConflict
(ObjectId objectId) Create a SubmoduleConflict for the given submodule object id -
Method Summary
-
Constructor Details
-
SubmoduleConflict
Create a SubmoduleConflict for the given submodule object id- Parameters:
objectId
- the id of the object to create a submodule conflict for
-
-
Method Details