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

Change in "git checkout" behaviour between 1.6.0.2 and 1.6.0.3

From
BSBruce Stephens <bruce.stephens@isode.com>
Date
Nov 12, 2008, 14:36 UTC
Message-ID
<80wsf9ovsp.fsf@tiny.isode.net>

The following works fine with 1.6.0.2 and before, but not 1.6.0.3 or later:

	git clone -n git git-test
        cd git-test
        git checkout -b work v1.6.0.2
When it breaks, the error is:
	error: Entry '.gitignore' would be overwritten by merge. Cannot merge.
I'm guessing it's a bug rather than a deliberate change?
Next: Michael J Gruber
Message 1 of 7 in “Change in "git checkout" behaviour between 1.6.0.2 and 1.6.0.3”
  1. Bruce StephensNov 12, 2008
  2. Michael J GruberNov 12, 2008
  3. Bruce StephensNov 12, 2008
  4. Junio C HamanoNov 12, 2008
  5. Bruce StephensNov 12, 2008
  6. Re* Change in "git checkout" behaviour between 1.6.0.2 and 1.6.0.3Junio C Hamano, Nov 12, 2008
  7. Bruce StephensNov 12, 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.