From: picca <picca@synchrotron-soleil.fr>
Date: Tue, 15 May 2007 11:37:20 GMT
Subject: Re: newby question about merge.
Message-ID: <20070515133720.20d76042@localhost.localdomain>
In-Reply-To: <f2c23k$dm0$1@sea.gmane.org>

On Tue, 15 May 2007 12:34:55 +0200
Jakub Narebski <jnareb@gmail.com> wrote:

> [Cc: picca <picca@synchrotron-soleil.Fr>, git@vger.kernel.org]
> 
> picca wrote:
> 
> > My question is how can I keep the upstream version of the configure
> > file instread of the one in the working directory.
> > 
> > I read about the stage(1:2:3) but I do not know how if it is
> > related to my problem.
> 
> You can just do "git cat-file -p :2:filename > filename", then
> "git add filename" (or "git update-index filename") to resolve
> conflict.
> 
> Check first if :2: is correct file (and not for example :3:).

In fact the right file was the :3: one.

Thank you very much.

Is it possible to add this git cat-file -p :2:filename > filename in
the man page of git-merge in the resolve conflict part ?

Or a link to the documentation speaking of this stage part.

Thanks

Frédéric