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

Re: merging problems with Linus' kernel tree.

From
DJDave Jones <davej@redhat.com>
Date
Feb 21, 2006, 20:29 UTC
Message-ID
<20060221202935.GC24159@redhat.com>
In-Reply-To
<Pine.LNX.4.64.0602211153570.30245@g5.osdl.org>
On Tue, Feb 21, 2006 at 12:03:04PM -0800, Linus Torvalds wrote:
 > That, in turn, is usually due to an aborted merge.

Hmm. (Recalls a power outage a few days ago). I'll bet that's when it happened.

 > Do a "git checkout -f".
Fixed, thanks.
		Dave
Previous: Linus Torvalds
Message 5 of 5 in “merging problems with Linus' kernel tree.”
  1. Dave JonesFeb 21, 2006
  2. Linus TorvaldsFeb 21, 2006
  3. Dave JonesFeb 21, 2006
  4. Linus TorvaldsFeb 21, 2006
  5. Dave JonesFeb 21, 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.