From: Jakub Narebski <jnareb@gmail.com>
Date: Wed, 24 Jan 2007 20:46:49 GMT
Subject: Re: How to pull only a few files from one branch to another?
Message-ID: <ep8ght$dlf$3@sea.gmane.org>
In-Reply-To: <20070124203913.GD4083@nan92-1-81-57-214-146.fbx.proxad.net>

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.


I wonder if fake-recording resolutions in git-rerere would help
in that case...
-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git