1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

doc: expand on squashing and rebasing to land a PR

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/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>
This commit is contained in:
Chengzhong Wu 2023-07-15 10:49:33 +08:00 committed by GitHub
parent 1d1a85b17c
commit 5da84a6341
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/contributing/collaborator-guide.md
View File

@ -540,6 +540,12 @@ For pull requests from first-time contributors, be
[welcoming](#welcoming-first-time-contributors). Also, verify that their git [welcoming](#welcoming-first-time-contributors). Also, verify that their git
settings are to their liking. settings are to their liking.
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 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. tests. This makes it much easier when bisecting to find a breaking change.