Re: newby question about merge.

[Johannes Schindelin <Johannes.Schindelin@gmx.de>]

Hi,

[please, Christian, do not cut the Cc: list. In particular, do _not_ cut 
the person you are _responding_ to from the Cc: list]

On Wed, 16 May 2007, Christian MICHON wrote:

> 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...
> 
> I could be wrong, but git-show works in this way only after version 1.5, 
> right ?

Yes. So what?

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

If you are using pre-1.5 Git, you should really, really upgrade.

If you do not want to do that, then _at least_ you should not confuse 
newbies, who _should_ use Git 1.5+.

And most importantly: if you suggest a change in the man pages, it should 
reflect the new Git versions, _not_ the old ones.

Okay?

Ciao,
Dscho