public interface ISVNConflictResolver
Modifier and Type | Interface and Description |
---|---|
static class |
ISVNConflictResolver.Choice
From JavaHL
|
Modifier and Type | Method and Description |
---|---|
SVNConflictResult |
resolve(SVNConflictDescriptor descrip)
The callback method invoked for each conflict during a
merge/update/switch operation.
|
SVNConflictResult resolve(SVNConflictDescriptor descrip) throws SVNClientException
descrip
- A description of the conflict.SubversionException
- If an error occurs.SVNClientException