Jeff King <peff@xxxxxxxx> writes: > On Thu, Jun 26, 2008 at 11:02:46PM -0400, Jeff King wrote: > >> It might be nicer if this were handled automatically, but it would >> violate git-fetch's rule about never deleting branches. Hmm. Is there actually such a rule? I was wondering if it might make more sense to do the equivalent of what checkout_entry() does (i.e. remove_subtree()) when there is such a conflict. After all, tracking branches are meant to accept rewinds and anything that happens on the remote end, and having to run "git remote prune" is not a feature but is a lack of feature in the "git fetch", which may make it look like deletion is somewhat special. -- 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
