title: Two conflicting git remotes
body: <p>We had an issue with a bad merge that couldn't be undone cleanly (it reverted one of the branches, so it couldn't be merged back in). We created a new version of the branch from the last good commit, merged the new changes into it cleanly, deleted the original and pushed the new one to the remote repository.</p>
  
  <p>However, now when we pull, it pulls from the deleted repository and pushes go to the new repository. If we <code>refresh prune</code>, the remote branch is no longer visible.</p>
  
  <p>We have a branch with a temporary name that we're using as a stop-gap measure, but how do we get back to using the right name?</p>