GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — doc: expand on squashing and rebasing to land a PR · nodejs/node@ea54784

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
  • doc/contributing
    • collaborator-guide.md
Expand file treeCollapse file tree
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)
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.