Thoughts
I wish git had like a per-branch stash. So you'd, maybe, `git stash --branch` and when you ran `git status` on that branch git would be like
"You have one stash on this branch" and you would remember to pop it and continue where you left off.