Class DefaultSVNConflictResolver

java.lang.Object
org.wso2.carbon.deployment.synchronizer.subversion.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.
  • Nested Class Summary

    Nested classes/interfaces inherited from interface org.tigris.subversion.svnclientadapter.ISVNConflictResolver

    org.tigris.subversion.svnclientadapter.ISVNConflictResolver.Choice
  • Constructor Summary

    Constructors
    Constructor
    Description
     
  • Method Summary

    Modifier and Type
    Method
    Description
    org.tigris.subversion.svnclientadapter.SVNConflictResult
    resolve(org.tigris.subversion.svnclientadapter.SVNConflictDescriptor conflict)
     

    Methods inherited from class java.lang.Object

    clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
  • Constructor Details

    • DefaultSVNConflictResolver

      public DefaultSVNConflictResolver()
  • Method Details

    • 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