Class SubmoduleConflict

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
  • Field Details

    • objectId

      private final ObjectId objectId
  • Constructor Details

    • SubmoduleConflict

      public SubmoduleConflict(ObjectId objectId)
      Create a SubmoduleConflict for the given submodule object id
      Parameters:
      objectId -
  • Method Details

    • size

      public int size()
      Description copied from class: Sequence
      Get size
      Specified by:
      size in class Sequence
      Returns:
      size
    • getObjectId

      public ObjectId getObjectId()
      Returns:
      the object id for the conflicting submodule