title: Force git stash to overwrite added files
body: <p>I have some files which were untracked in git.  I made some changes and wanted to commit them, but realised I had forgotten to check in the unmodified files first.  So I stashed the files, then added the unmodified versions.  </p>
  
  <p>Then when I apply the stash to the repository, I get conflicts due to the files having already been added.  </p>
  
  <p>How can I apply the stash, and force the versions in the stash to be used in preference to the originals in the repository?</p>
  
  <p>Thanks</p>