public class ConflictResult
extends java.lang.Object
svn_wc_conflict_choice_t
.Modifier and Type | Field and Description |
---|---|
private int |
choice
A value corresponding to the
svn_wc_conflict_choice_t enum. |
static int |
chooseBase
Resolve the conflict by choosing the base file.
|
static int |
chooseMerged
Resolve the conflict by choosing the merged object
(potentially manually edited).
|
static int |
chooseMineConflict
Resolve the conflict by choosing own (local) version of the
object (for conflicted hunks only).
|
static int |
chooseMineFull
Resolve the conflict by choosing own (local) version of the
object.
|
static int |
chooseTheirsConflict
Resolve the conflict by choosing the incoming (repository)
version of the object (for conflicted hunks only).
|
static int |
chooseTheirsFull
Resolve the conflict by choosing the incoming (repository)
version of the object.
|
private java.lang.String |
mergedPath
The path to the result of a merge, or
null . |
static int |
postpone
Nothing done to resolve the conflict; conflict remains.
|
Constructor and Description |
---|
ConflictResult(int choice,
java.lang.String mergedPath)
Create a new conflict result instace.
|
Modifier and Type | Method and Description |
---|---|
int |
getChoice() |
java.lang.String |
getMergedPath() |
ConflictResult |
toApache() |
public static final int postpone
public static final int chooseBase
public static final int chooseTheirsFull
public static final int chooseMineFull
public static final int chooseTheirsConflict
public static final int chooseMineConflict
public static final int chooseMerged
private int choice
svn_wc_conflict_choice_t
enum.private java.lang.String mergedPath
null
.public ConflictResult(int choice, java.lang.String mergedPath)
public ConflictResult toApache()
public int getChoice()
svn_wc_conflict_choice_t
enum.public java.lang.String getMergedPath()
null
.