Comment by cobar

Break down the changes into smaller units. I try to create discrete units that can exist independently from each other and then limit PRs to only one module or subsystem. The sequence of PRs ends up being something like requirements, API docs for the module, tests, implementation per module, integration between modules. This limits the size of any fix and reduces the churn.