org.tigris.subversion.svnclientadapter
public static final class ISVNConflictResolver.Choice extends java.lang.Object
Modifier and Type | Field and Description |
---|---|
static int |
chooseBase
User chooses the base file.
|
static int |
chooseMerged
Resolve the conflict by choosing the merged object
(potentially manually edited).
|
static int |
chooseMine
Resolve the conflict by choosing own (local) version of the
object (for conflicted hunks only).
|
static int |
chooseMineFull
User chooses own version of file.
|
static int |
chooseTheirs
Resolve the conflict by choosing the incoming (repository)
version of the object (for conflicted hunks only).
|
static int |
chooseTheirsFull
User chooses the repository file.
|
static int |
postpone
User did nothing; conflict remains.
|
Constructor and Description |
---|
ISVNConflictResolver.Choice() |
public static final int postpone
public static final int chooseBase
public static final int chooseTheirsFull
public static final int chooseMineFull
public static final int chooseTheirs
public static final int chooseMine
public static final int chooseMerged