title: Accidently Pulled Down Branch with the Same Name
body: <p>I accidentally pulled down a branch with the same name as a local branch</p>
  
  <pre><code>* 909a2b5 - (HEAD, feature/form) xxxx &lt;imrane&gt;
  * c9d6bc5 - xxxx &lt;imrane&gt;
  | * 6e96409 - (origin/feature) xxx &lt;anandmv&gt;
  |/  
  *   38e35d8 - (origin/develop, origin/HEAD, develop) xxx &lt;imrane&gt;
  </code></pre>
  
  <p>I had committed all changes to my local branch, then ran</p>
  
  <pre><code>git fetch origin
  </code></pre>
  
  <p>and then tried to track the remote branch and got the following error</p>
  
  <pre><code>git checkout --track origin/feature
  error: there are still refs under 'refs/heads/feature'
  fatal: Failed to lock ref for update: Is a directory
  </code></pre>
  
  <p>Questions:<br>
  1. How do I revert without losing the commits I had on feature/form<br>
  2. How do I pull down the branch without having a naming collision?</p>