Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit d3041df

Browse filesBrowse files
legendecasruyadorno
authored andcommitted
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 804d880 commit d3041df
Copy full SHA for d3041df

File tree

Expand file treeCollapse file tree

1 file changed

+6
-0
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+6
-0
lines changed
Open diff view settings
Collapse file

‎doc/contributing/collaborator-guide.md‎

Copy file name to clipboardExpand all lines: doc/contributing/collaborator-guide.md
+6Lines changed: 6 additions & 0 deletions
  • Display the source diff
  • Display the rich diff
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 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.