Package org.tmatesoft.svn.cli.svn
Class SVNConflictAcceptPolicy
java.lang.Object
org.tmatesoft.svn.cli.svn.SVNConflictAcceptPolicy
public class SVNConflictAcceptPolicy
extends java.lang.Object
- Version:
- 1.3
-
Field Summary
FieldsModifier and TypeFieldDescriptionstatic final SVNConflictAcceptPolicy
Resolve the conflict with the pre-conflict base file.static final SVNConflictAcceptPolicy
static final SVNConflictAcceptPolicy
static final SVNConflictAcceptPolicy
static final SVNConflictAcceptPolicy
Resolve the conflict with the pre-conflict working copy file.static final SVNConflictAcceptPolicy
private java.lang.String
static final SVNConflictAcceptPolicy
static final SVNConflictAcceptPolicy
Resolve the conflict with the post-conflict base file.static final SVNConflictAcceptPolicy
static final SVNConflictAcceptPolicy
static final SVNConflictAcceptPolicy
-
Constructor Summary
Constructors -
Method Summary
Modifier and TypeMethodDescriptionstatic SVNConflictAcceptPolicy
fromString
(java.lang.String accept) java.lang.String
toString()
Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
-
Field Details
-
INVALID
-
UNSPECIFIED
-
BASE
Resolve the conflict with the pre-conflict base file. -
MINE_CONFLICT
Resolve the conflict with the pre-conflict working copy file. -
MINE_FULL
-
WORKING
-
THEIRS_CONFLICT
Resolve the conflict with the post-conflict base file. -
THEIRS_FULL
-
POSTPONE
-
EDIT
-
LAUNCH
-
myName
private java.lang.String myName
-
-
Constructor Details
-
SVNConflictAcceptPolicy
private SVNConflictAcceptPolicy(java.lang.String name)
-
-
Method Details
-
toString
public java.lang.String toString()- Overrides:
toString
in classjava.lang.Object
-
fromString
-