logoalt Hacker News

vidarhtoday at 2:07 PM0 repliesview on HN

I do that a whole lot because most of the time I know the foundation will be accepted mostly as-is, maybe with small tweaks but not major changes.

So I branch of a previous PR instead of development when the changes are related, and continue development, and rebase after the previous PR has been merged.

Usually this leads to less rework and fewer merge conflicts.

Very occasionally it means having to rework subsequent work because the approach was actually wrong, but I'll take that over the hassle of continuing to work from a base I know is already outdated.