t6036: add lots of detail for directory/file conflicts in recursive case