title: Visual Studio 2013 Github commit deadlock
body: <p>A few friends and I are working on a project via GitHub. We are all sharing the same branch, which may or may not be a good idea.</p>
  <p>I edited some of the code and committed the changes. I went to push commit to GitHub (I am working with Visual Studio 2013 and it's built-in Git tool), but I got this error:</p>
  <blockquote>
  <p>&quot;There are new remote changes.  You must pull them before you can
  push.&quot;</p>
  </blockquote>
  <p>So I tried to pull the remote changes and I get this error:</p>
  <blockquote>
  <p>&quot;An error occurred. Detailed message: An error was raised by libgit2.
  Category = 21 (MergeConflict). 9 uncommitted changes would be
  overwritten by merge&quot;</p>
  </blockquote>
  <p>I tried to change branches so that I might be able to push my changes and then merge them with the first branch, but I got this error:</p>
  <blockquote>
  <p>&quot;Cannot switch to master because there are uncommitted changes. Commit
  or undo your changes before you switch branches. See the Output window
  for details.&quot;</p>
  </blockquote>
  <p>I have no idea what to do, except possibly to email my changes to one of my friends and have them push my changes. However, I don't know what would happen with my local commits.</p>
  <h2>EDIT</h2>
  <p>The problem is resolved. After making sure to sync all the commits I opened git bash and pulled the remote commits. After a few attempts I went back to Visual Studio and discovered that it had registered the merge. I resolved all of the conflicted files and was able to push the project.</p>
  <p>Thanks to everyone who answered!</p>