it sounds like self-inflicted GitHub specific issue. I was very surprised that people still do it that way when we had to host a project on GitHub instead of our tools. And even on GitHub one can just fork new branch for another change and keep stacking that way.