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

Re: [BUG] unable to checkout branch with a clean worktree

From
Clemens Buchacher <drizzd@aon.at>
Date
Jan 5, 2009, 16:05 UTC
Message-ID
<20090105160527.GA7718@localhost>
In-Reply-To
<35079.bFoQE3daRhY=.1231170168.squirrel@webmail.hotelhot.dk>
On Mon, Jan 05, 2009 at 04:42:48PM +0100, Anders Melchiorsen wrote:
Show 5 quoted lines
> Git v1.6.1: The final checkout fails with an error about merge conflicts.
> However, the worktree is clean, and I am not trying to do a merge.
> 
> Is this a known issue? If so, what is the particular issue that we should
> avoid?

This is fixed by the recent patches for verify_absent. (Actually, just PATCH 2/3 should be enough to fix this issue.)

http://article.gmane.org/gmane.comp.version-control.git/104317
Previous: Anders MelchiorsenNext: Anders Melchiorsen
Message 2 of 3 in “[BUG] unable to checkout branch with a clean worktree”
  1. Anders MelchiorsenJan 5, 2009
  2. Clemens BuchacherJan 5, 2009
  3. Anders MelchiorsenJan 5, 2009

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.