Comment 19 for bug 113809

Bazaar should also try to prevent the user accidentally adding and committing merge conflict files (i.e the THIS, OTHER, BASE files). If there is a file that is versioned and the user adds the THIS, OTHER, BASE files then Bazaar should either ask the user if that's what they really meant, print a message telling the user they just did something strange, or refuse to add those files and if the user really wants to add them then they need to pass some option to the add command.

I think this would prevent a lot of these merge problems in the first place.