From: Clemens Buchacher <drizzd@aon.at>
To: Anders Melchiorsen <mail@cup.kalibalik.dk>
Cc: git@vger.kernel.org
Subject: Re: [BUG] unable to checkout branch with a clean worktree
Date: Mon, 5 Jan 2009 17:05:27 +0100 [thread overview]
Message-ID: <20090105160527.GA7718@localhost> (raw)
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
next prev parent reply other threads:[~2009-01-05 16:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-05 15:42 [BUG] unable to checkout branch with a clean worktree Anders Melchiorsen
2009-01-05 16:05 ` Clemens Buchacher [this message]
2009-01-05 17:54 ` Anders Melchiorsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090105160527.GA7718@localhost \
--to=drizzd@aon.at \
--cc=git@vger.kernel.org \
--cc=mail@cup.kalibalik.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).