From: Anders Melchiorsen Date: Mon, 05 Jan 2009 17:54:48 GMT Subject: Re: [BUG] unable to checkout branch with a clean worktree Message-ID: <87fxjxk593.fsf@cup.kalibalik.dk> In-Reply-To: <20090105160527.GA7718@localhost> Clemens Buchacher writes: > 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. > > 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 Right, I can confirm that the patch [2/3] fixes this, also in the repo where the issue originally turned up. Thanks, Anders.