[Cosmo-dev] Branching

[Brian Moseley]

On 8/14/07, Mike <bear at code-bear.com> wrote:

> The changes have to be merged - whether it's done for each or as part
> of a single merge is up to the dev team.  I'm just pointing out that in
> the past the single-release-backport-merge and is often not simple.

i've messed these up in the past, so i won't argue, tho i'm pretty
sure i have it down now. if the rest of the team wants to commit them
in both places at the same time, then fine.