From: Jakub Narebski <jnareb@gmail.com>
Date: Wed, 24 Jan 2007 22:04:39 GMT
Subject: Re: How to pull only a few files from one branch to another?
Message-ID: <200701242304.40904.jnareb@gmail.com>
In-Reply-To: <20070124212731.GE4083@nan92-1-81-57-214-146.fbx.proxad.net>

Yann Dirson wrote:
> On Wed, Jan 24, 2007 at 09:46:49PM +0100, Jakub Narebski wrote:
>> 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.

>> 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.

Another solution would be to record partial merge (using "ours" strategy
for files we don't want to merge), then --amend it. 

-- 
Jakub Narebski
Poland