>Some source control programs allow you to "merge" those changes into the two branches, but everyone I've ever talked to...and they've used many different source control tools...has said it was far easier to manually make the changes than to try to do the automated merge.
>

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.