Interface ConflictResolverCallback

  • All Superinterfaces:
    java.util.EventListener

    public interface ConflictResolverCallback
    extends java.util.EventListener
    The callback API used to handle conflicts encountered during merge/update/switch operations.
    Since:
    1.5
    • Method Detail

      • resolve

        ConflictResult resolve​(ConflictDescriptor descrip)
                        throws SubversionException
        The callback method invoked for each conflict during a merge/update/switch operation. NOTE: The files that are potentially passed in the ConflictDescriptor are in repository-normal format (LF line endings and contracted keywords).
        Parameters:
        descrip - A description of the conflict.
        Returns:
        The result of any conflict resolution, from the ConflictResult enum.
        Throws:
        SubversionException - If an error occurs.