WorkFlow: Refactor the conflict detection. In the process, improve the error
message to give some diagnostics that should prove helpful.
Authored by: ecarter 2007-04-26
Parent: [r5295]
Child: [r5297]