I used to think that this always drops your stash from the stash list.
http://ariejan.net/2008/04/23/git-using-the-stash/
However, if you have a conflict you need to manually call:
git stash drop
after you have merged your conflict.
https://www.kernel.org/pub/software/scm/git/docs/git-stash.html