Hmm, this is awfully similar to what we do here, but I'm not aware of any way to currently do this.
Typically, errors like this are caught in our code-review process.
I would wonder what would happen in the case of a merge conflict, and when that happens, how would it get resolved.
