Re: How to pull only a few files from one branch to another?

From: Yann Dirson <ydirson@altern.org>
Date: Jan 24, 2007, 21:27 UTC
Message-ID: <20070124212731.GE4083@nan92-1-81-57-214-146.fbx.proxad.net>
In-Reply-To: <ep8ght$dlf$3@sea.gmane.org>

On Wed, Jan 24, 2007 at 09:46:49PM +0100, Jakub Narebski wrote:

Show 11 quoted lines

> Yann Dirson wrote:
> 
> > What was particular about this tree, is that we are several people
> > working on it, namely developpers taking care of the app, and me as
> > build manager taking care of the build mechanics as well as kernel+OS.
> > So the task was logically divided: one dev would merge the app, and I
> > would merge everything else.  As you see, it's far from one-file
> > merges, but the problem is quite similar.
> 
> This I think would be best handled by (future/prototype) submodules
> support.

That could be used for some cases, but it's harder to use to avoid getting a Makefile merged with the rest of the subtree.

> I wonder if fake-recording resolutions in git-rerere would help
> in that case...

Hm. Looks like that would require being able to communicate rerere results from one workspace to another.