git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [BUG] unable to checkout branch with a clean worktree
@ 2009-01-05 15:42 Anders Melchiorsen
  2009-01-05 16:05 ` Clemens Buchacher
  0 siblings, 1 reply; 3+ messages in thread
From: Anders Melchiorsen @ 2009-01-05 15:42 UTC (permalink / raw)
  To: git

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?


Regards,
Anders.


cd $(mktemp -d repo.XXXXXX)
git init

echo init >start
git add start
git commit -m A

git branch parallel

mkdir a b
echo x >a/one
echo y >a/two
echo z >b/three
git add .
git commit -m B

git checkout parallel
mkdir -p a/one a/two b
echo xx >a/one/cat
echo yy >a/two/cow
echo zz >b/unrelated
git add .
git commit -m C

# This fails:
git checkout master

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-01-05 17:57 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-05 15:42 [BUG] unable to checkout branch with a clean worktree Anders Melchiorsen
2009-01-05 16:05 ` Clemens Buchacher
2009-01-05 17:54   ` Anders Melchiorsen

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).