I wanted to clarify why most people do manual merges.

>Yeah, that's why I said most people do this manually <g>. Some of this is complex enough without trying to merge branches back together.