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