public interface ISVNConflictHandler
| Modifier and Type | Method | Description |
|---|---|---|
SVNConflictResult |
handleConflict(SVNConflictDescription conflictDescription) |
Handles the conflict given the conflict description
conflictDescription and returns |
SVNConflictResult handleConflict(SVNConflictDescription conflictDescription) throws SVNException
conflictDescription and returns
SVNConflictResult.getConflictChoice() values of SVNConflictChoice.MINE_CONFLICT and
SVNConflictChoice.THEIRS_CONFLICT are not legal for conflicts in binary files or properties.conflictDescription - describes the exact nature of the conflict, and provides information
to help resolve itconflictDescriptionSVNException