This is a must have! because using git stash save / git stash pop destroys the stash stack when there is nothing to save!!! See answer to https://stackoverflow.com/questions/27697835/stash-branch-working-copy-confu...
Unfortunately, this PR has rotten and now conflicts.