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

Re: merging problems with Linus' kernel tree.

From
Linus Torvalds <torvalds@osdl.org>
Date
Feb 21, 2006, 18:55 UTC
Message-ID
<Pine.LNX.4.64.0602211052360.30245@g5.osdl.org>
In-Reply-To
<20060221183306.GC22988@redhat.com>
On Tue, 21 Feb 2006, Dave Jones wrote:
>
> Documentation/cpu-hotplug.txt: needs update
> fatal: Entry 'Documentation/cpu-hotplug.txt' would be overwritten by merge. Cannot merge.

This means that it's dirty in the index, not that you've committed any changes.

Do a "git diff".

(It may also be that the diff is empty, and only shows the filename. That means that you've changed the mtime - for example edited it, and then undone the edit - so that the file is dirty in the index, even if the _contents_ are the same. If so, do a "git-update-index --refresh" or similar, or just ask for "git status", which will do it for you as part of checking the status of all your files).

		Linus
Previous: Dave JonesNext: Dave Jones
Message 2 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.