Comment 2 for bug 519024

Just adding a comment after encountering the same issue...

I think this is a fairly important issue as Bazaar aims to be an intuitive DVCS.

It is quite common for two users to create the same file or folder on necessity OR as an effort to resolve or cherry pick a merge (bad idea).
To the user(s), they see the same file / folder names and same / similar content, yet the resolution of the conflict is not easily understood even if the conflict does make sense from a VCS database point of view.
The user needs a way to simply say 'these are the same thing', mark as resolved or enable text conflict.
The work around of deleting or renaming one users content is confusing but may still be acceptable if the user is clearly informed of the issue and steps to resolve it.