Comment 5 for bug 1401356

Revision history for this message
Mike Schmidt (michael-schmidt82) wrote : Re: Deal with duplicate files last when combining folders

Also, if dummy files are stop being created due to space limitations, then just copy what doesn't conflict.

When dummy files/original files are being removed, start creating the dummy files that should have been created while conflicting files are resolved. Ask the user to resolve those conflicts last.