From: Shawn O. Pearce Date: Wed, 24 Jan 2007 06:07:04 GMT Subject: Re: How to pull only a few files from one branch to another? Message-ID: <20070124060703.GA25759@spearce.org> In-Reply-To: <17846.63082.935311.947093@lisa.zopyra.com> Bill Lear wrote: > I probably should have thought ahead and made this fix on a branch, > merged it into my master branch and then into my topic branch ... I > think. Yes. That is standard "good practice" with Git. Unfortunately it does require a little planning ahead if the base to start on isn't immediately obvious (you need to think "I want this here, and here, and here.. and compute the merge base"). -- Shawn.