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

Re: git merge no longer handles add/add

From
Jakub Narebski <jnareb@gmail.com>
Date
Nov 19, 2007, 19:56 UTC
Message-ID
<fhspor$9ci$1@ger.gmane.org>
In-Reply-To
<7vabpanilk.fsf@gitster.siamese.dyndns.org>
Junio C Hamano wrote:
Show 5 quoted lines
> Exactly.  We may keep conflict markers in the file left in the
> work tree to highlight which lines are unique to the side that
> added more (iow, one group of lines delimited by <<< === >>> is
> empty while the other is not) but this is currently treated as
> "fishy, needs human validation" to catch mismerges.

BTW can xdifflib merge use original diff3 conflict markers, i.e. <<< [main] |||| [ancestor] === [branch] >>>?

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
Previous: Junio C HamanoNext: Johannes Schindelin
Message 7 of 8 in “git merge no longer handles add/add”
  1. Martin LanghoffNov 19, 2007
  2. Martin LanghoffNov 19, 2007
  3. Junio C HamanoNov 19, 2007
  4. Martin LanghoffNov 19, 2007
  5. J. Bruce FieldsNov 19, 2007
  6. Junio C HamanoNov 19, 2007
  7. Jakub NarebskiNov 19, 2007
  8. Johannes SchindelinNov 20, 2007

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.