title: Suddenly can't create local/remote git branches
body: <p>Not sure how I've managed this but I can't create a local and remote branch anymore.</p>
  
  <pre><code>~/myapp(master) &gt; git checkout -b new_feature origin/new_feature
  fatal: git checkout: updating paths is incompatible with switching branches.
  Did you intend to checkout 'origin/new_feature' which can not be resolved as commit?
  </code></pre>
  
  <p>I've tried re-cloning my app in case the .git directory was corrupted, but no luck. Any suggestions?</p>