From: Jakub Narebski <jnareb@gmail.com>
Date: Tue, 15 May 2007 10:34:55 GMT
Subject: Re: newby question about merge.
Message-ID: <f2c23k$dm0$1@sea.gmane.org>
In-Reply-To: <20070515113820.2621c8d5@localhost.localdomain>

[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:).
-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git