git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: commiting while the current version is in conflict

From
Shawn O. Pearce <spearce@spearce.org>
Date
Oct 16, 2008, 23:23 UTC
Message-ID
<20081016232332.GD9877@spearce.org>
In-Reply-To
<2d460de70810161607n470e9479h8f7885040cbf5428@mail.gmail.com>
Richard Hartmann <richih.mailinglist@gmail.com> wrote:
Show 7 quoted lines
> 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.
Previous: Richard HartmannNext: Richard Hartmann
Message 7 of 10 in “commiting while the current version is in conflict”
  1. Richard HartmannOct 16, 2008
  2. Miklos VajnaOct 16, 2008
  3. Shawn O. PearceOct 16, 2008
  4. Richard HartmannOct 16, 2008
  5. Avery PennarunOct 17, 2008
  6. Richard HartmannOct 16, 2008
  7. Shawn O. PearceOct 16, 2008
  8. Richard HartmannOct 16, 2008
  9. Jakub NarebskiOct 16, 2008
  10. Richard HartmannOct 17, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.