On Thu, Jun 26, 2008 at 11:02:46PM -0400, Jeff King wrote: > So to summarize, the problem is that you have an old tracking branch > "refs/remotes/sched" that exists on the client, but upstream has since > removed it in favor of "sched/devel", which you are now trying to fetch. > And of course there is a conflict, because of the ref naming rules. > > This doesn't work seamlessly because git-fetch never removes old > tracking branches, even if they have been deleted upstream. And normally > there is no conflict; leaving the old branches means they don't > disappear from under you. BTW, you can get the opposite problem, too. If you have "refs/remotes/origin/foo/bar", and then the remote removes "foo/bar" in favor of "foo", you will have a conflict on fetch. -Peff -- 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
