Interface ISVNConflictResolver
public interface ISVNConflictResolver
-
Nested Class Summary
Nested Classes -
Method Summary
Modifier and TypeMethodDescriptionresolve
(SVNConflictDescriptor descrip) The callback method invoked for each conflict during a merge/update/switch operation.
-
Method Details
-
resolve
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
-