title: Git reference conflicts between branches (unable to update local branch)
body: <p>I'm experiencing the following error while trying to <strong>git fetch</strong> a remote branch:</p>
  
  <blockquote>
    <p>error: Ref refs/origin/remotes/my-branch is at <strong>some-hash</strong> but expected <strong>another-hash</strong>
    From github.com:<strong>my-repository</strong>
    ! <strong>some-hash</strong> my-branch -> origin/my-branch (unable to update local ref)</p>
  </blockquote>
  
  <p>I have no idea what the hell just blew up. Any enlightenment?</p>