On Fri, Dec 26, 2008 at 00:19, Kalle Sommer Nielsen <[email protected]> wrote: > 2008/12/26 Kalle Sommer Nielsen <[email protected]>: >> 2008/12/25 Hannes Magnusson <[email protected]>: >>> I've never used TortoriseCVS, I think Kalle has. >>> Kalle; could you write up a small "howto"? >> >> I added a list item to the TortoiseCVS howto for quick how to checkout >> a specific branch. > > Whoops forgot the link: > http://wiki.php.net/doc/scratchpad/howto#quick_guide_for_improving_the_existing_php_documentation >
Could you write up few sentences about how to actually _merge_? Merging by first creating a patch from one branch and the applying it to another, or by letting cvs merging specific revisions, doesn't really matter. Just whichever is easier.. -Hannes
