What is the merge game plan?

Oh and see also Design spec (classes, methods, etc) which I only saw after I wrote the above (despite @trusktr clearly making it a linked topic, above :)).