My group has gotten into a weird problem that we don\'t know how to solve; the basic question is how to sync an upstream repository from a local repo that has already been pushe