diff --git a/doc/contributing/collaborator-guide.md b/doc/contributing/collaborator-guide.md index aef66d1382bcbc..a4218acc7d4fd0 100644 --- a/doc/contributing/collaborator-guide.md +++ b/doc/contributing/collaborator-guide.md @@ -540,11 +540,11 @@ For pull requests from first-time contributors, be [welcoming](#welcoming-first-time-contributors). Also, verify that their git settings are to their liking. -If the pull request contains more than one commit, it can be landed either by -squashing into one commit or by rebasing all the commits. Generally, a -collaborator should land the pull request with squashing. If the pull request -has more than one self-contained subsystem commits, a collaborator may land it -with rebasing. +If a pull request contains more than one commit, it can be landed either by +squashing into one commit or by rebasing all the commits, or a mix of the two. +Generally, a collaborator should land a pull request by squashing. If a pull +request has more than one self-contained subsystem commits, a collaborator +may land it as several commits. All commits should be self-contained, meaning every commit should pass all tests. This makes it much easier when bisecting to find a breaking change.