Class ISVNConflictResolver.Choice
java.lang.Object
org.tigris.subversion.svnclientadapter.ISVNConflictResolver.Choice
- Enclosing interface:
- ISVNConflictResolver
From JavaHL
-
Field Summary
FieldsModifier and TypeFieldDescriptionstatic final int
User chooses the base file.static final int
Resolve the conflict by choosing the merged object (potentially manually edited).static final int
Resolve the conflict by choosing own (local) version of the object (for conflicted hunks only).static final int
User chooses own version of file.static final int
Resolve the conflict by choosing the incoming (repository) version of the object (for conflicted hunks only).static final int
User chooses the repository file.static final int
User did nothing; conflict remains. -
Constructor Summary
Constructors -
Method Summary
-
Field Details
-
postpone
public static final int postponeUser did nothing; conflict remains.- See Also:
-
chooseBase
public static final int chooseBaseUser chooses the base file.- See Also:
-
chooseTheirsFull
public static final int chooseTheirsFullUser chooses the repository file.- See Also:
-
chooseMineFull
public static final int chooseMineFullUser chooses own version of file.- See Also:
-
chooseTheirs
public static final int chooseTheirsResolve the conflict by choosing the incoming (repository) version of the object (for conflicted hunks only).- See Also:
-
chooseMine
public static final int chooseMineResolve the conflict by choosing own (local) version of the object (for conflicted hunks only).- See Also:
-
chooseMerged
public static final int chooseMergedResolve the conflict by choosing the merged object (potentially manually edited).- See Also:
-
-
Constructor Details
-
Choice
public Choice()
-