WorkFlow to convert the 'conflicting changes detected' error into a warning.
Authored by: cboos 2007-05-20
Parent: [r5445]
Child: [r5447]