From: Clemens Buchacher Date: Mon, 05 Jan 2009 16:05:27 GMT Subject: Re: [BUG] unable to checkout branch with a clean worktree 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: > 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