Class ISVNConflictResolver.Choice

java.lang.Object
org.tigris.subversion.svnclientadapter.ISVNConflictResolver.Choice
Enclosing interface:
ISVNConflictResolver

public static final class ISVNConflictResolver.Choice extends Object
From JavaHL
  • Field Summary

    Fields
    Modifier and Type
    Field
    Description
    static 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
    Constructor
    Description
     
  • Method Summary

    Methods inherited from class java.lang.Object

    clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
  • Field Details

    • postpone

      public static final int postpone
      User did nothing; conflict remains.
      See Also:
    • chooseBase

      public static final int chooseBase
      User chooses the base file.
      See Also:
    • chooseTheirsFull

      public static final int chooseTheirsFull
      User chooses the repository file.
      See Also:
    • chooseMineFull

      public static final int chooseMineFull
      User chooses own version of file.
      See Also:
    • chooseTheirs

      public static final int chooseTheirs
      Resolve the conflict by choosing the incoming (repository) version of the object (for conflicted hunks only).
      See Also:
    • chooseMine

      public static final int chooseMine
      Resolve the conflict by choosing own (local) version of the object (for conflicted hunks only).
      See Also:
    • chooseMerged

      public static final int chooseMerged
      Resolve the conflict by choosing the merged object (potentially manually edited).
      See Also:
  • Constructor Details

    • Choice

      public Choice()