|
|||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | ||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
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 |
---|
SVNConflictResult resolve(SVNConflictDescriptor descrip) throws SVNClientException
descrip
- A description of the conflict.
SubversionException
- If an error occurs.
SVNClientException
|
|||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | ||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |