I’ve used a feature branch workflow for years, so stashes are localized. Basically except really giant refactors (which are rare, it’s a 20 year old codebase)

I’ve used a feature branch workflow for years, so stashes are localized. Basically except really giant refactors (which are rare, it’s a 20 year old codebase) you just fork off a feature branch. Master really only exists for merges and the occasional get it out right now one liner. I say all this with the caveat that our internal scripts merge master into the feature branch on commit, so it forces you to deal with diff rot early and easily.