public class SVNCommandLineConflictHandler extends Object implements ISVNConflictHandler
Constructor and Description |
---|
SVNCommandLineConflictHandler(SVNConflictAcceptPolicy accept,
SVNCommandEnvironment environment) |
Modifier and Type | Method and Description |
---|---|
SVNConflictResult |
handleConflict(SVNConflictDescription conflictDescription)
Handles the conflict given the conflict description
conflictDescription and returns
SVNConflictResult.getConflictChoice() values of SVNConflictChoice.MINE_CONFLICT and
SVNConflictChoice.THEIRS_CONFLICT are not legal for conflicts in binary files or properties. |
SVNConflictResult |
handleConflictNoStats(SVNConflictDescription conflictDescription) |
public SVNCommandLineConflictHandler(SVNConflictAcceptPolicy accept, SVNCommandEnvironment environment)
public SVNConflictResult handleConflict(SVNConflictDescription conflictDescription) throws SVNException
ISVNConflictHandler
conflictDescription
and returns
SVNConflictResult.getConflictChoice()
values of SVNConflictChoice.MINE_CONFLICT
and
SVNConflictChoice.THEIRS_CONFLICT
are not legal for conflicts in binary files or properties.handleConflict
in interface ISVNConflictHandler
conflictDescription
- describes the exact nature of the conflict, and provides information
to help resolve itconflictDescription
SVNException
public SVNConflictResult handleConflictNoStats(SVNConflictDescription conflictDescription) throws SVNException
SVNException
Copyright © 2019. All rights reserved.