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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html