From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: newby question about merge.
Date: Tue, 15 May 2007 12:34:55 +0200 [thread overview]
Message-ID: <f2c23k$dm0$1@sea.gmane.org> (raw)
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
next prev parent reply other threads:[~2007-05-15 10:30 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-15 9:38 newby question about merge picca
2007-05-15 10:25 ` Alex Riesen
2007-05-15 10:34 ` Jakub Narebski [this message]
2007-05-15 11:37 ` picca
2007-05-15 21:47 ` Junio C Hamano
2007-05-16 6:33 ` picca
2007-05-16 11:43 ` Johannes Schindelin
2007-05-16 14:21 ` Christian MICHON
2007-05-16 14:45 ` Johannes Schindelin
2007-05-16 19:35 ` Christian MICHON
2007-05-16 22:39 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='f2c23k$dm0$1@sea.gmane.org' \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.