When manually resolving directory conflicts isn't a feature

[Talden]

> Why not shelve them automatically and tell the user how to either (a)
> get them back, or (b) delete them permanently?

I like the idea... though isn't there a severe shelve bug on windows
that would mean anything else using shelve as the solution would also
be broken?

With that bug fixed though I can see a number of these kinds of cases
using shelve.

--
Talden