3 ms·
You should squash PRs. What you shouldn't do is indiscriminately squash PRs. Having a bunch of "oops, fix" and review fix commits lying around makes it harder f
by Manishearth 10y ago
You should squash PRs. What you shouldn't do is indiscriminately squash PRs. Having a bunch of "oops, fix" and review fix commits lying around makes it harder for everyone too. It also affects bisection much more. "don't squash PRs" is just bad advice; it's more nuanced than that.
Split your work into bite sized pieces, and amend/squash the relevant fixups into these before merging.
Since these tasks can need knowledge of rebase, I offer to do them for new contributors too, which usually fixes that issue.
- ashitlerferad 10y agoUse `git rebase -i` but don't squash PRs.
- Manishearth 10y agogit rebase -i is one of the ways you can squash PRs and there are tons of cases where you should.