Clear this box to restore the merge-conflict dialog. Recently I told you how to take advantage of Windows 8’s cool new file-copy feature. What I didn’t mention was a small, but potentially significant ...