title: Error was raised by libgit2. Category = Ssh
body: <p>I have been using VS2013 git. I had some problems with renaming my files to use lowercase letters, so I had to rename then manually in Github. Now, when I try to sync files I get this error:</p>
  
  <p><strong><em>An error occurred. Detailed message: An error was raised by libgit2. Category = Ssh (MergeConflict).
  14 uncommitted changes would be overwritten by merge</em></strong></p>
  
  <p>When I try to push I get this error:</p>
  
  <p><strong><em>There are new remote changes.  You must pull them before you can push.</em></strong></p>
  
  <p>I have 9 incoming commits and 1 outgoing commit in VS2013.</p>
  
  <p>I have tried using the Git Shell to pull/push, and there it says <strong><em>"Everything up-to date."</em></strong></p>
  
  <p>I'm not too good at using git, and this is a problem I can't solve.</p>