Modifier and Type | Field and Description |
---|---|
static SVNConflictChoice |
BASE
Constant saying to choose the base version of the file to resolve the conflict here and now.
|
static SVNConflictChoice |
MERGED
Constant saying to choose the merged version of the file to resolve the conflict here and now.
|
static SVNConflictChoice |
MINE_CONFLICT
Constant saying to choose the own (for conflicted hunks) version of the file to resolve the conflict here and now.
|
static SVNConflictChoice |
MINE_FULL
Constant saying to choose the own version of the file to resolve the conflict here and now.
|
static SVNConflictChoice |
POSTPONE
Constant saying: don't resolve the conflict now.
|
static SVNConflictChoice |
THEIRS_CONFLICT
Constant saying to choose the incoming (for conflicted hunks) version of the file to resolve the conflict here and now.
|
static SVNConflictChoice |
THEIRS_FULL
Constant saying to choose the incoming version of the file to resolve the conflict here and now.
|
public static SVNConflictChoice POSTPONE
public static SVNConflictChoice BASE
public static SVNConflictChoice THEIRS_FULL
public static SVNConflictChoice MINE_FULL
public static SVNConflictChoice THEIRS_CONFLICT
public static SVNConflictChoice MINE_CONFLICT
public static SVNConflictChoice MERGED
Copyright © 2023. All rights reserved.