- java.lang.Object
-
- org.eclipse.jgit.diff.Sequence
-
- org.eclipse.jgit.submodule.SubmoduleConflict
-
public class SubmoduleConflict extends Sequence
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
Constructors Constructor Description SubmoduleConflict(ObjectId objectId)
Create a SubmoduleConflict for the given submodule object id
-
-
-
Constructor Detail
-
SubmoduleConflict
public SubmoduleConflict(ObjectId objectId)
Create a SubmoduleConflict for the given submodule object id- Parameters:
objectId
-
-
-