Commit ea54784
doc: expand on squashing and rebasing to land a PR
PR-URL: #48751
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>1 parent 30ea480 commit ea54784
1 file changed
Lines changed: 6 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -540,6 +540,12 @@ For pull requests from first-time contributors, be | |||
| 540 | 540 | [welcoming](#welcoming-first-time-contributors). Also, verify that their git | |
| 541 | 541 | settings are to their liking. | |
| 542 | 542 | ||
| 543 | + If a pull request contains more than one commit, it can be landed either by | ||
| 544 | + squashing into one commit or by rebasing all the commits, or a mix of the two. | ||
| 545 | + Generally, a collaborator should land a pull request by squashing. If a pull | ||
| 546 | + request has more than one self-contained subsystem commits, a collaborator | ||
| 547 | + may land it as several commits. | ||
| 548 | + | ||
| 543 | 549 | All commits should be self-contained, meaning every commit should pass all | |
| 544 | 550 | tests. This makes it much easier when bisecting to find a breaking change. | |
| 545 | 551 | ||
0 commit comments