Model merge

[mylesJ]

The compare tool works well enough but how about extending it to include merge capabilities as well?

This would help us with the scenario where two architects have checked out the same package from source control (one with high contention such as the database model), make changes, then check it back in.

What I would like to see is that the architect's changes who checked in first can be merged in to the other architects local copy before checking in himself.