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

Re: [PATCH] builtin-rerere: fix conflict markers parsing

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 7, 2008, 17:39 UTC
Message-ID
<7vy74d4mr8.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<alpine.DEB.1.00.0807071400180.18205@racer>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
Show 13 quoted lines
> So what about
>
> 	<<<<<<< This hunk contains =====
> 	anythin
> 	=======
>
> 	Hello
> 	=======
> 	somethin else
> 	>>>>>>> problem!
>
>
> If you fix it, I think you should do it properly, and analyze the index.

I do not know offhand if analyzing the index is the right solution, but your point is very valid. You need to know which ====== is the real one to be able to properly flip sides of the conflict.

I however think detecting that we have this ambiguous hunk is easy, and punting gracefully and not re-resolving in such a case is million times better than producing random results that the users need to be worried about.

Previous: Johannes SchindelinNext: Junio C Hamano
Message 7 of 9 in “builtin-rerere: fix conflict markers parsing”
  1. builtin-rerere: fix conflict markers parsingOlivier Marin, Jul 7, 2008
  2. Johannes SchindelinJul 7, 2008
  3. Olivier MarinJul 7, 2008
  4. Johannes SchindelinJul 7, 2008
  5. Olivier MarinJul 7, 2008
  6. Johannes SchindelinJul 7, 2008
  7. Junio C HamanoJul 7, 2008
  8. Re* [PATCH] builtin-rerere: fix conflict markers parsingJunio C Hamano, Jul 8, 2008
  9. Olivier MarinJul 8, 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.