static SVNConflictAcceptPolicy |
SVNConflictAcceptPolicy.BASE |
Resolve the conflict with the pre-conflict base file.
|
static SVNConflictAcceptPolicy |
SVNConflictAcceptPolicy.EDIT |
|
static SVNConflictAcceptPolicy |
SVNConflictAcceptPolicy.INVALID |
|
static SVNConflictAcceptPolicy |
SVNConflictAcceptPolicy.LAUNCH |
|
static SVNConflictAcceptPolicy |
SVNConflictAcceptPolicy.MINE_CONFLICT |
Resolve the conflict with the pre-conflict working copy file.
|
static SVNConflictAcceptPolicy |
SVNConflictAcceptPolicy.MINE_FULL |
|
private SVNConflictAcceptPolicy |
SVNCommandLineConflictHandler.myAccept |
|
private SVNConflictAcceptPolicy |
SVNCommandEnvironment.myResolveAccept |
|
static SVNConflictAcceptPolicy |
SVNConflictAcceptPolicy.POSTPONE |
|
static SVNConflictAcceptPolicy |
SVNConflictAcceptPolicy.THEIRS_CONFLICT |
Resolve the conflict with the post-conflict base file.
|
static SVNConflictAcceptPolicy |
SVNConflictAcceptPolicy.THEIRS_FULL |
|
static SVNConflictAcceptPolicy |
SVNConflictAcceptPolicy.UNSPECIFIED |
|
static SVNConflictAcceptPolicy |
SVNConflictAcceptPolicy.WORKING |
|