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

Why would merge fail on a one-line addition?

From
MSMarc Singer <elf@buici.com>
Date
Mar 25, 2006, 22:26 UTC
Message-ID
<20060325222601.GA1500@buici.com>
One of the unmerged files leaves this trail.
  elf@florence ~...git/linux-2.6 > git-ls-files --unmerged
  100644 6262d449120cdcde5db1b079806dcc0d9b5e6b7c 1       arch/arm/mach-lh7a40x/irq-lpd7a40x.c
  100644 dcb4e17b941990eabe8992680c9aa9b67afb6fd4 3       arch/arm/mach-lh7a40x/irq-lpd7a40x.c
  elf@florence ~...git/linux-2.6 > git-cat-file blob 6262d449120cdcde5db1b079806dcc0d9b5e6b7c > a
  elf@florence ~...git/linux-2.6 > git-cat-file blob dcb4e17b941990eabe8992680c9aa9b67afb6fd4 > b
  elf@florence ~...git/linux-2.6 > diff a b                                       21a22
  > #include "common.h"
Why would git have a problem with this?
Next: Linus Torvalds
Message 1 of 3 in “Why would merge fail on a one-line addition?”
  1. Marc SingerMar 25, 2006
  2. Linus TorvaldsMar 26, 2006
  3. Junio C HamanoMar 26, 2006

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.