From: Christian MICHON <christian.michon@gmail.com>
Date: Wed, 16 May 2007 14:21:01 GMT
Subject: Re: newby question about merge.
Message-ID: <46d6db660705160721u24e43f7bmb5171555158089fb@mail.gmail.com>
In-Reply-To: <Pine.LNX.4.64.0705161241560.6410@racer.site>

On 5/16/07, Johannes Schindelin wrote:
> > You can just do "git cat-file -p :2:filename > filename", then "git add
> > filename" (or "git update-index filename") to resolve conflict.
>
> Do we really want to advertise this obscure-looking plumbing? Wouldn't it
> be better to teach people to use "git show" instead?
>
> I mean, people can get intimidated by that...
>
> Ciao,
> Dscho
>

I could be wrong, but git-show works in this way only after version 1.5, right ?

As far as I can tell, using git-1.4.4.4 or ealier, you would still need
git-cat-file -p... to fix this merge conflict.

-- 
Christian