Class ISVNConflictResolver.Choice

  • Enclosing interface:
    ISVNConflictResolver

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

      Fields 
      Modifier and Type Field Description
      static int chooseBase
      User chooses the base file.
      static int chooseMerged
      Resolve the conflict by choosing the merged object (potentially manually edited).
      static int chooseMine
      Resolve the conflict by choosing own (local) version of the object (for conflicted hunks only).
      static int chooseMineFull
      User chooses own version of file.
      static int chooseTheirs
      Resolve the conflict by choosing the incoming (repository) version of the object (for conflicted hunks only).
      static int chooseTheirsFull
      User chooses the repository file.
      static int postpone
      User did nothing; conflict remains.
    • Constructor Summary

      Constructors 
      Constructor Description
      Choice()  
    • Method Summary

      • Methods inherited from class java.lang.Object

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

      • postpone

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

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

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

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

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

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

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

      • Choice

        public Choice()