title: Unable to do a git pull
body: <p>I am trying to do a git pull - which is not working because my version and the master version have diverged.</p>
  
  <p>I want to be able to get rid of all the changes I've made on my side and just get the master version as it is.</p>
  
  <p>Here's the git status and git pull details:</p>
  
  <pre><code>C:\Users\User\Documents\Source\Project&gt;git pull
  
  M       Gruntfile.coffee
  U       client/site/stylesheets/site.css
  U       client/site/stylesheets/site.scss
  M       package.json
  M       server/app.coffee
  M       server/app.js
  M       test/main.test.coffee
  U       test/main.test.js
  D       test/server/GetAndPost.test.js
  M       test/server/getAndPost.test.coffee
  A       test/server/getAndPost.test.js
  A       test/server/testStub.coffee
  A       test/server/testStub.test.js
  
  Pull is not possible because you have unmerged files.
  Please, fix them up in the work tree, and then use 'git add/rm &lt;file&gt;'
  as appropriate to mark resolution, or use 'git commit -a'.
  
  C:\Users\User\Documents\Source\Project&gt;git status
  # On branch master
  # Your branch and 'origin/master' have diverged,
  # and have 1 and 3 different commits each, respectively.
  #   (use "git pull" to merge the remote branch into yours)
  #
  # You have unmerged paths.
  #   (fix conflicts and run "git commit")
  #
  # Changes to be committed:
  #
  #       modified:   Gruntfile.coffee
  #       modified:   package.json
  #       modified:   server/app.coffee
  #       modified:   server/app.js
  #       modified:   test/main.test.coffee
  #       modified:   test/server/getAndPost.test.coffee
  #       renamed:    test/server/GetAndPost.test.js -&gt; test/server/getAndPost.test.js
  #       new file:   test/server/testStub.coffee
  #       new file:   test/server/testStub.test.js
  #
  # Unmerged paths:
  #   (use "git add &lt;file&gt;..." to mark resolution)
  #
  #       both modified:      client/site/stylesheets/site.css
  #       both modified:      client/site/stylesheets/site.scss
  #       both modified:      test/main.test.js
  #
  # Changes not staged for commit:
  #   (use "git add &lt;file&gt;..." to update what will be committed)
  #   (use "git checkout -- &lt;file&gt;..." to discard changes in working directory)
  #
  #       modified:   .idea/workspace.xml
  
  C:\Users\User\Documents\Source\Project&gt;git add client\site\stylesheets\*          
  fatal: Unable to create 'C:/Users/User/Documents/Source/Project/.git/index.lock':
  File exists.
  
  If no other git process is currently running, this probably means a
  git process crashed in this repository earlier. Make sure no other git
  process is running and remove the file manually to continue.
      #
  </code></pre>