title: git pull (update local file only)
body: <p>i just want to update my local files with git. but every time i try to pull i get and error saying that i need to commit certain file first. what is the way to update local file without using commit??</p>
  
  <p>here is the error message</p>
  
  <p>$ git pull
  Enter passphrase for key '/c/Users/me/.ssh/id_rsa':
  Updating 4dsdSe6e..70fb5b6
  error: Your local changes to the following files would be overwritten by merge:
          grails-app/conf/DataSource.groovy
  Please, commit your changes or stash them before you can merge.
  Aborting</p>