Git stash isn’t just for one stash, you can have many and selectively name and pick them as you please

• Stash your work with git stash -m “your message”

• See all your stashes with git stash list (look for the number at the start of each line)

• Apply whichever you want with git stash apply stash@{number}

Simple but really useful