Class DefaultSVNConflictResolver

  • All Implemented Interfaces:
    org.tigris.subversion.svnclientadapter.ISVNConflictResolver

    public class DefaultSVNConflictResolver
    extends Object
    implements org.tigris.subversion.svnclientadapter.ISVNConflictResolver
    Default conflict resolver attempts to resolve all SVN conflicts by accepting the artifact versions in the remote repository.
    • Constructor Detail

      • DefaultSVNConflictResolver

        public DefaultSVNConflictResolver()
    • Method Detail

      • resolve

        public org.tigris.subversion.svnclientadapter.SVNConflictResult resolve​(org.tigris.subversion.svnclientadapter.SVNConflictDescriptor conflict)
                                                                         throws org.tigris.subversion.svnclientadapter.SVNClientException
        Specified by:
        resolve in interface org.tigris.subversion.svnclientadapter.ISVNConflictResolver
        Throws:
        org.tigris.subversion.svnclientadapter.SVNClientException