Skip to content

Commit ea54784

Browse files
legendecasRafaelGSS
authored andcommitted
doc: expand on squashing and rebasing to land a PR
PR-URL: #48751 Reviewed-By: Moshe Atlow <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Rafael Gonzaga <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Michael Dawson <[email protected]>
1 parent 30ea480 commit ea54784

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

doc/contributing/collaborator-guide.md

+6
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,12 @@ For pull requests from first-time contributors, be
540540
[welcoming](#welcoming-first-time-contributors). Also, verify that their git
541541
settings are to their liking.
542542

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+
543549
All commits should be self-contained, meaning every commit should pass all
544550
tests. This makes it much easier when bisecting to find a breaking change.
545551

0 commit comments

Comments
 (0)