From: Björn Steinbrink <b.steinbrink@gmx.de>
Date: Fri, 11 Dec 2009 11:09:44 GMT
Subject: Re: How to selectively recreate merge state?
Message-ID: <20091211110944.GB19232@atjola.homenet>
In-Reply-To: <4B222289.6000004@drmicha.warpmail.net>

On 2009.12.11 11:44:25 +0100, Michael J Gruber wrote:
> Jakub Narebski venit, vidit, dixit 11.12.2009 02:33:
> >  $ git checkout --conflict=merge foo
> >  error: path 'foo' does not have all three versions
> > 
> > Let's recover it by hand:
> > 
> >  $ echo -e "100644 257cc5642cb1a054f08cc83f2d943e56fd3ebe99 1\tfoo" | 
> >    git update-index --index-info
> >  $ git ls-files --stage foo
> >  100644 257cc5642cb1a054f08cc83f2d943e56fd3ebe99 1       foo
> >  100644 3bd1f0e29744a1f32b08d5650e62e2e62afb177c 2       foo
> >  100644 469a41eda5c8b45503a3bfc32ad6b5decc658132 3       foo
> >  $ git checkout --conflict=merge foo
> 
> Yeah, if we knew that sha1...

Hm, isn't that "$(git merge-base HEAD MERGE_HEAD):foo"?

Björn