title: Git: 'Master cannot be resolved to branch' after merge
body: <p>Every time I merge a branch back into my master branch, I can no longer push to origin. I get the message <code>fatal: master cannot be resolved to branch</code></p>
  
  <p>I made a simple test change:</p>
  
  <ul>
  <li>Created a new branch <code>git branch TestBranch</code></li>
  <li>Made a change to TestBranch and commited</li>
  <li>Checked out back to master <code>git checkout Master</code></li>
  <li>Merged TestBranch <code>git merge TestBranch</code></li>
  </ul>
  
  <p>The merge seems to have gone fine, but now when I use Git status the Master branch does not tell me that it is ahead of the origin. And when I try to push to origin Master I get the message above.</p>
  
  <p>Does anybody know what is causing this problem?</p>