I've been enjoying learning about git worktrees: https://spin.atomicobject.com/2016/06/26/parallelize-development-git-worktrees/
When you regularly work on several branches, it's really nice to have separate folders for each branch. You can easily compare files across branches, and you need far less stashing!
