Comment by sjagoe

I've probably just learned to ignore a lot of that. Stash conflicts are annoying. And I have a long list of stashed changes that I should just purge at this point.

All the discussion here has me very interested to look at jj, though. Although most of my git interaction these days is through magit, and changing that will probably be hard.