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. Any ideas why the merge isn't deleting foo/bar? The users are using git version 1.5.2.5 in Ubuntu Hoary. Thanks in advance. -Mark - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
| Paul Jackson | Re: cpuset-remove-sched-domain-hooks-from-cpusets |
| James Bottomley | Re: Announce: Linux-next (Or Andrew's dream :-)) |
| David Miller | Slow DOWN, please!!! |
| Masami Hiramatsu | Re: [RFC PATCH v4] Unified trace buffer |
git: | |
| Gerrit Renker | [PATCH 27/37] dccp: Integration of dynamic feature activation - part 2 (server side) |
| Parag Warudkar | Re: 2.6.29-rc3: tg3 dead after resume |
| Jarek Poplawski | [PATCH] pkt_sched: Destroy gen estimators under rtnl_lock(). |
