title: Can not pull changes in git with visual studio 2013?
body: <p>I am new to git in visual studio 2013 when i try to push changes i got the following error messages saying <code>There are new remote changes.  You must pull them before you can push.</code>and when i try to pull the changes i get.</p>
  
  <pre><code>An error occurred. Detailed message: An error was raised by libgit2. Category = 21 (MergeConflict).
  1 uncommitted change would be overwritten by merge
  </code></pre>