From: Steven E. Harris <seh@panix.com>
Date: Fri, 13 Aug 2010 22:19:30 GMT
Subject: Re: With feature branches, what is ever committed directly to master
Message-ID: <m2ocd6yx3h.fsf@Spindle.sehlabs.com>
In-Reply-To: <AANLkTinwQhD-b0-6uQYwBa3r7psNvPp5LMcjqHVKLF+c@mail.gmail.com>

Jon Seymour <jon.seymour@gmail.com> writes:

> Otherwise, I keep them clean and merge them into the base of my
> working branch (as described into an earlier note).  By always merging
> into the base of my working branch (and never the tip) I can keep my
> working tree stable and my patches clean.

Can you clarify what you mean by "merging into the base" and "never the
tip"? Perhaps a pointer to the earlier note you mentioned would suffice.

-- 
Steven E. Harris