with the advent of high quality agentic LLMs i find that you don't need to do hard rebases anymore. just branch off latest master and reapply the whole diff. that's how i upgraded hashpool from SRI 1.2.0 to 1.5.0. it took me a week of vibe coding and i got to bed on time every night.