title: Git refuses to reset/discard files
body: <p>I have a project with certain js files which I cannot update. I run OSX locally and my remote/staging server is Linux (CentOS).</p>
  
  <p>Right after cloning my project locally, i noticed I have all those files with git status <code>modified</code>. I never modified them, so I tried to <code>discard changes</code> or <code>reset</code> them, but they come up again. The change that is in the modification is deleting all lines and adding them again. </p>
  
  <p>I'm not sure why this happens or how to fix it so that my git status is clean as it needs to be.</p>
  
  <p>Here is a few lines from the git status:</p>
  
  <pre><code>#   modified:   app/webroot/js/ckeditor/plugins/devtools/lang/el.js
  #   modified:   app/webroot/js/ckeditor/plugins/devtools/lang/fa.js
  #   modified:   app/webroot/js/ckeditor/plugins/devtools/lang/gu.js
  </code></pre>
  
  <p>UPDATE 1: </p>
  
  <p>I have now managed to commit the above files, but the staging server is locked because it won't pull new edits:</p>
  
  <pre><code>error: Your local changes to the following files would be overwritten by merge:
      app/webroot/js/ckeditor/_source/lang/ar.js
      app/webroot/js/ckeditor/_source/lang/bg.js
      app/webroot/js/ckeditor/_source/lang/bn.js
      app/webroot/js/ckeditor/_source/lang/cs.js
      ...
  Aborting
  </code></pre>
  
  <p>I can't commit/push because:</p>
  
  <pre><code>Updates were rejected because a pushed branch tip is behind its remote counterpart
  </code></pre>
  
  <p>I tried:</p>
  
  <pre><code>git reset --hard
  </code></pre>
  
  <p>and</p>
  
  <pre><code>git stash
  git stash drop
  </code></pre>
  
  <p>But they don't work, nothing happens.</p>
  
  <p>UPDATE 2:</p>
  
  <p><code>git diff</code> gives me:</p>
  
  <pre><code>The file will have its original line endings in your working directory.
  warning: CRLF will be replaced by LF in app/webroot/js/ckeditor/_source/lang/fa.js.
  The file will have its original line endings in your working directory.
  warning: CRLF will be replaced by LF in app/webroot/js/ckeditor/_source/lang/gu.js.
  The file will have its original line endings in your working directory.
  ...
  </code></pre>