Class 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 Summary

      Fields 
      Modifier and Type Field Description
      private ObjectId objectId  
    • Constructor Summary

      Constructors 
      Constructor Description
      SubmoduleConflict​(ObjectId objectId)
      Create a SubmoduleConflict for the given submodule object id
    • Method Summary

      All Methods Instance Methods Concrete Methods 
      Modifier and Type Method Description
      ObjectId getObjectId()  
      int size()
      Get size
      • Methods inherited from class java.lang.Object

        clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    • Field Detail

      • objectId

        private final ObjectId objectId
    • Constructor Detail

      • SubmoduleConflict

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

      • 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