public class SVNConflictAcceptPolicy extends Object
Modifier and Type | Field and Description |
---|---|
static SVNConflictAcceptPolicy |
BASE
Resolve the conflict with the pre-conflict base file.
|
static SVNConflictAcceptPolicy |
EDIT |
static SVNConflictAcceptPolicy |
INVALID |
static SVNConflictAcceptPolicy |
LAUNCH |
static SVNConflictAcceptPolicy |
MINE_CONFLICT
Resolve the conflict with the pre-conflict working copy file.
|
static SVNConflictAcceptPolicy |
MINE_FULL |
static SVNConflictAcceptPolicy |
POSTPONE |
static SVNConflictAcceptPolicy |
THEIRS_CONFLICT
Resolve the conflict with the post-conflict base file.
|
static SVNConflictAcceptPolicy |
THEIRS_FULL |
static SVNConflictAcceptPolicy |
UNSPECIFIED |
static SVNConflictAcceptPolicy |
WORKING |
Modifier and Type | Method and Description |
---|---|
static SVNConflictAcceptPolicy |
fromString(String accept) |
String |
toString() |
public static final SVNConflictAcceptPolicy INVALID
public static final SVNConflictAcceptPolicy UNSPECIFIED
public static final SVNConflictAcceptPolicy BASE
public static final SVNConflictAcceptPolicy MINE_CONFLICT
public static final SVNConflictAcceptPolicy MINE_FULL
public static final SVNConflictAcceptPolicy WORKING
public static final SVNConflictAcceptPolicy THEIRS_CONFLICT
public static final SVNConflictAcceptPolicy THEIRS_FULL
public static final SVNConflictAcceptPolicy POSTPONE
public static final SVNConflictAcceptPolicy EDIT
public static final SVNConflictAcceptPolicy LAUNCH
public static SVNConflictAcceptPolicy fromString(String accept)
Copyright © 2018. All rights reserved.