Package | Description |
---|---|
org.apache.subversion.javahl | |
org.tmatesoft.svn.core.javahl17 |
Modifier and Type | Method and Description |
---|---|
ConflictResult.Choice |
ConflictResult.getChoice() |
static ConflictResult.Choice |
ConflictResult.Choice.valueOf(String name)
Returns the enum constant of this type with the specified name.
|
static ConflictResult.Choice[] |
ConflictResult.Choice.values()
Returns an array containing the constants of this enum type, in
the order they are declared.
|
Modifier and Type | Method and Description |
---|---|
void |
ISVNClient.resolve(String path,
Depth depth,
ConflictResult.Choice conflictResult)
Resolves the conflicted state on a WC path (or tree).
|
void |
SVNClient.resolve(String path,
Depth depth,
ConflictResult.Choice conflictResult) |
Constructor and Description |
---|
ConflictResult(ConflictResult.Choice choice,
String mergedPath)
Create a new conflict result instace.
|
Modifier and Type | Method and Description |
---|---|
void |
SVNClientImpl.resolve(String path,
Depth depth,
ConflictResult.Choice conflictResult) |
Copyright © 2022. All rights reserved.