Any advice on merging class libraries? Is it possible? Right now we have a comment convention to identify changes, so that if there is a conflict we can copy and paste the modified code. This is ugly and just waiting for trouble.

Also, how do people manage source control for database structures? If I'm making changes to the database, and someone else in the company is too, how do we merge/reconcile those differences? If that's not possible, how can we see what those differences are?

We use Subversion for source control.

Thanks,

David