In general, it's good practice to make branches that are independent from other
changes and in general kept to a diff of ~500 lines in order to keep pull
requests (PRs) easy to review.
One issue though is how to deal with the scenario where you need to