Mark Desnoyer, Mon, Jan 21, 2008 20:45:07 +0100: > Hi, > > I've run across a small problem and I was wondering if I could get > some help. I have two users A and B. They are both git-cloned from a > common repository on a different server. > > User A moves a directory: > foo/bar/ ==> bar > using: > git mv foo/bar bar > git commit > git push > > Meanwhile, user B is doing some other changes that are completely > unrelated and has a few local commits. Now, when user B pulls from the > repository (git pull), and returns no errors merging, the directory > "bar" is created, but "foo/bar" is not deleted, although, it becomes > untracked. Directories are never tracked. It should have been deleted though. Did it have (or still has) some untracked files in it? - 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
