From: "Shawn O. Pearce" <spearce@spearce.org>
To: Richard Hartmann <richih.mailinglist@gmail.com>
Cc: Miklos Vajna <vmiklos@frugalware.org>, git@vger.kernel.org
Subject: Re: commiting while the current version is in conflict
Date: Thu, 16 Oct 2008 16:23:32 -0700 [thread overview]
Message-ID: <20081016232332.GD9877@spearce.org> (raw)
In-Reply-To: <2d460de70810161607n470e9479h8f7885040cbf5428@mail.gmail.com>
Richard Hartmann <richih.mailinglist@gmail.com> wrote:
> On Fri, Oct 17, 2008 at 00:48, Miklos Vajna <vmiklos@frugalware.org> wrote:
>
> > Not sure, but in general blocking conflict markers by default would be a
> > bad idea IMHO, several markup language (asciidoc, for example) makes use
> > of the >>>, === and such character sequences.
>
> Doesn't git keep metadata about conflicts, as well?
Yes, in the index. But it erases it when you stage the file with
"git add".
Go look at my prior message about how "git commit -a" is staging
the files prior to commit. That makes git commit think everything
has been resolved, because you've told git, everything is resolved.
--
Shawn.
next prev parent reply other threads:[~2008-10-16 23:24 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-16 22:10 commiting while the current version is in conflict Richard Hartmann
2008-10-16 22:48 ` Miklos Vajna
2008-10-16 23:00 ` Shawn O. Pearce
2008-10-16 23:26 ` Richard Hartmann
2008-10-17 1:16 ` Avery Pennarun
2008-10-16 23:07 ` Richard Hartmann
2008-10-16 23:23 ` Shawn O. Pearce [this message]
2008-10-16 23:31 ` Richard Hartmann
2008-10-16 23:42 ` Jakub Narebski
2008-10-17 7:25 ` Richard Hartmann
-- strict thread matches above, loose matches on Subject: below --
2008-10-16 23:39 Junio Hamano
2008-10-17 7:21 ` Richard Hartmann
2008-10-17 8:37 ` Junio C Hamano
2008-10-17 9:32 ` Richard Hartmann
2008-10-17 9:16 ` Jakub Narebski
2008-10-17 9:35 ` Richard Hartmann
2008-10-17 9:36 ` Junio C Hamano
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=20081016232332.GD9877@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=richih.mailinglist@gmail.com \
--cc=vmiklos@frugalware.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).