Managing "evil twins"

"Evil twins" are two elements of the same name that have been created in different versions of the same directory element. When the directory versions are merged, it is not clear which twin has been lost, nor even that the twins may be different versions that need to be merged.

Evil twins can be inadvertently created in scenarios such as the following:

There are several ways to manage evil twins: