Pierre Habouzit <madcoder@xxxxxxxxxx> writes: > if in a branch [branch1] you track the file: dir1/file1.c > and in the branch [branch2] you track elsewhere/file1.c and dir1 be > symlink on elsewhere, then it's not possible to checkout the branch > [branch1] if your previous checkout was [branch2]. You have to manually > remove the symlink `dir1` else git complains that checkouting branch1 > would overwrite dir1/file1.c. > > I'm not sure how to fix this, and it's quite painful actually :) Yeah, I think our handling of symlinks in both read-tree and merge-recursive codepath are Ok for symlinks at the leaf level but not for intermediate levels. I think we have some patches in the recent git (post 1.5.1) to fix (perhaps some of) the issues, though. - 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
