title: git stash pop: avoiding stash drop and un-staging steps
body: <p>Sometimes when running <code>git stash pop</code> there are merge conflicts that need to be resolved. This happens a lot when I have to stash/pop before/after switching branches.</p>
  
  <p>The conflicts are no problem to deal with, but this has two annoying side effects:</p>
  
  <ol>
  <li><p>All changes coming from the stash are now staged and have to be unstaged</p></li>
  <li><p><code>stash@{0}</code> is not dropped and has to be dropped manually</p></li>
  </ol>
  
  <p>Looking for suggestions on how to make this process a little smoother.</p>