Class SVNTextConflictDescription


  • public class SVNTextConflictDescription
    extends SVNConflictDescription
    SVNTextConflictDescription brings information about conflict on a file.
    Since:
    1.3
    Version:
    1.3
    • Constructor Detail

      • SVNTextConflictDescription

        public SVNTextConflictDescription​(SVNMergeFileSet mergeFiles,
                                          SVNNodeKind nodeKind,
                                          SVNConflictAction conflictAction,
                                          SVNConflictReason conflictReason)
        Creates a new SVNTextConflictDescription object.
        Parameters:
        mergeFiles - files involved in the merge
        nodeKind - node kind of the item which the conflict occurred on conflict; otherwise false
        conflictAction - action which lead to the conflict
        conflictReason - why the conflict ever occurred
        Since:
        1.3