Class ConflictDescriptor


  • public class ConflictDescriptor
    extends java.lang.Object
    The description of a merge conflict, encountered during merge/update/switch operations.
    Since:
    1.5
    • Method Detail

      • getPath

        public java.lang.String getPath()
      • getKind

        public int getKind()
      • getNodeKind

        public int getNodeKind()
        See Also:
        NodeKind
      • getPropertyName

        public java.lang.String getPropertyName()
      • isBinary

        public boolean isBinary()
      • getMIMEType

        public java.lang.String getMIMEType()
      • getAction

        public int getAction()
      • getReason

        public int getReason()
      • getBasePath

        public java.lang.String getBasePath()
      • getTheirPath

        public java.lang.String getTheirPath()
      • getMyPath

        public java.lang.String getMyPath()
      • getMergedPath

        public java.lang.String getMergedPath()
      • getOperation

        public int getOperation()