org.tigris.subversion.svnclientadapter
Interface ISVNConflictResolver

public interface ISVNConflictResolver

Nested Class Summary

static class

ISVNConflictResolver.Choice From JavaHL

Method Summary

SVNConflictResult

resolve(SVNConflictDescriptor descrip) The callback method invoked for each conflict during a merge/update/switch operation.

Method Detail

resolve

SVNConflictResult resolve(SVNConflictDescriptor descrip)
                          throws SVNClientException

The callback method invoked for each conflict during a merge/update/switch operation.

Parameters:

descrip - A description of the conflict.

Returns:

The result of any conflict resolution.

Throws:

SubversionException - If an error occurs.

SVNClientException