From: "Christian MICHON" <christian.michon@gmail.com>
To: git@vger.kernel.org
Subject: Re: newby question about merge.
Date: Wed, 16 May 2007 16:21:01 +0200 [thread overview]
Message-ID: <46d6db660705160721u24e43f7bmb5171555158089fb@mail.gmail.com> (raw)
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
next prev parent reply other threads:[~2007-05-16 14:21 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
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 [this message]
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=46d6db660705160721u24e43f7bmb5171555158089fb@mail.gmail.com \
--to=christian.michon@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).