- All Superinterfaces:
public interface ConflictResolverCallback extends EventListener
The callback API used to handle conflicts encountered during merge/update/switch operations.
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).