Frankly this is a good example of over-engineering what should be a non-problem. In the vast majority of cases the option I want is "keep both" - this reduces t

Frankly this is a good example of over-engineering what should be a non-problem. In the vast majority of cases the option I want is "keep both" - this reduces the chance of data loss to zero and enables me to get on with something that is more important to me at that moment (and use my excellent human brain to delete one of the conflicted files later). As soon as the UX designers attempt to do anything else the UI becomes very complicated, very quickly (as shown here). One final point - from the linked article it would appear that the Windows UX designers remain addicted to modal dialogs which are, IMO, the antithesis of a productive UI.