Re: [Chromium-dev] Getting the multicontext-1-branch via CVS

[Alan H. <al...@re...>]

On Fri, Nov 30, 2001 at 08:08:09AM -0800, Greg Humphreys wrote:
> Another small point:
> 
> It seems to me from examining the commit logs that people have been making
> little bug-fixes here and there in one branch or the other.  I hope that
> eventually those small fixes will merge into one consistent branch, right?
> 
Yep. We usually merge any changes from the trunk back into the branch to
make sure all changes from the trunk are in the new code, and then we
merge back onto the trunk.

Alan.