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 by legendecas · Pull Request #48751 · nodejs/node

Conversation

@legendecas

@legendecas legendecas commented Jul 13, 2023

Copy link
Copy Markdown
Member

Document the choice of squashing and rebasing when landing a pull request containing more than one subsystem commits.

Refs: #47956 (comment)

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
All reactions
@legendecas
doc: expand on squashing and rebasing to land a PR
4cdc3c0
@nodejs-github-bot

nodejs-github-bot commented Jul 13, 2023

Copy link
Copy Markdown
Collaborator

Review requested:

  • @nodejs/tsc
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@nodejs-github-bot nodejs-github-bot added the doc Issues and PRs related to Node.js documentation. label Jul 13, 2023
RafaelGSS
RafaelGSS reviewed Jul 13, 2023
View reviewed changes
Comment thread doc/contributing/collaborator-guide.md Resolved

Uh oh!

There was an error while loading. Please reload this page.
@legendecas
fixup! doc: expand on squashing and rebasing to land a PR
d3ae12c
MoLow
MoLow approved these changes Jul 13, 2023
View reviewed changes

@MoLow MoLow left a comment

Copy link
Copy Markdown
Member

There was a problem hiding this comment.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. should we mention the corresponding commit-queue-rebase PRs the Commit Queue should land as multiple self-contained commits. and commit-queue-squash PRs the Commit Queue should land as one squashed commit. labels?

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
All reactions
aduh95
aduh95 reviewed Jul 13, 2023
View reviewed changes
Comment thread doc/contributing/collaborator-guide.md Resolved

Uh oh!

There was an error while loading. Please reload this page.
aduh95
aduh95 reviewed Jul 13, 2023
View reviewed changes
Comment thread doc/contributing/collaborator-guide.md Resolved

Uh oh!

There was an error while loading. Please reload this page.
@legendecas
fixup! doc: expand on squashing and rebasing to land a PR
45f80af
aduh95
aduh95 reviewed Jul 13, 2023
View reviewed changes
Comment thread doc/contributing/collaborator-guide.md Resolved

Uh oh!

There was an error while loading. Please reload this page.
lpinca
lpinca approved these changes Jul 13, 2023
View reviewed changes
@legendecas
fixup! doc: expand on squashing and rebasing to land a PR
0c4e188
RafaelGSS
RafaelGSS approved these changes Jul 14, 2023
View reviewed changes
aduh95
aduh95 approved these changes Jul 14, 2023
View reviewed changes
@lpinca lpinca added the commit-queue-squash PRs the Commit Queue should land as one squashed commit. label Jul 14, 2023
mhdawson
mhdawson approved these changes Jul 14, 2023
View reviewed changes

@mhdawson mhdawson left a comment

Copy link
Copy Markdown
Member

There was a problem hiding this comment.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
All reactions
@aduh95 aduh95 added author ready PRs with CI started, the required approvals, and no outstanding review comments. commit-queue PRs queued for automated landing through the Commit Queue. labels Jul 14, 2023
@nodejs-github-bot nodejs-github-bot removed the commit-queue PRs queued for automated landing through the Commit Queue. label Jul 15, 2023
@nodejs-github-bot
nodejs-github-bot merged commit 5da84a6 into nodejs:main Jul 15, 2023
@nodejs-github-bot

nodejs-github-bot commented Jul 15, 2023

Copy link
Copy Markdown
Collaborator

Landed in 5da84a6
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@legendecas
legendecas deleted the docs/pr-rebase branch July 19, 2023 03:14
Ceres6 pushed a commit to Ceres6/node that referenced this pull request Aug 14, 2023
@legendecas @Ceres6
doc: expand on squashing and rebasing to land a PR
faf73fe 
PR-URL: nodejs#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]>
Ceres6 pushed a commit to Ceres6/node that referenced this pull request Aug 14, 2023
@legendecas @Ceres6
doc: expand on squashing and rebasing to land a PR
b219e5c 
PR-URL: nodejs#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]>
UlisesGascon pushed a commit to UlisesGascon/node that referenced this pull request Aug 14, 2023
@legendecas @UlisesGascon
doc: expand on squashing and rebasing to land a PR
21b8202 
PR-URL: nodejs#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]>
RafaelGSS pushed a commit that referenced this pull request Aug 15, 2023
@legendecas @RafaelGSS
doc: expand on squashing and rebasing to land a PR
ea54784 
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]>
@UlisesGascon UlisesGascon mentioned this pull request Aug 15, 2023
v20.6.0 proposal #49185
Merged
ruyadorno pushed a commit that referenced this pull request Sep 12, 2023
@legendecas @ruyadorno
doc: expand on squashing and rebasing to land a PR
cb565ee 
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]>
ruyadorno pushed a commit that referenced this pull request Sep 13, 2023
@legendecas @ruyadorno
doc: expand on squashing and rebasing to land a PR
10495ad 
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]>
@ruyadorno ruyadorno mentioned this pull request Sep 13, 2023
v18.18.0 proposal #49220
Merged
ruyadorno pushed a commit that referenced this pull request Sep 17, 2023
@legendecas @ruyadorno
doc: expand on squashing and rebasing to land a PR
d3041df 
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]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lpinca lpinca lpinca approved these changes
@MoLow MoLow MoLow approved these changes
@aduh95 aduh95 aduh95 approved these changes
@RafaelGSS RafaelGSS RafaelGSS approved these changes
+1 more reviewer
@mhdawson mhdawson mhdawson approved these changes
Reviewers whose approvals may not affect merge requirements

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

author ready PRs with CI started, the required approvals, and no outstanding review comments. commit-queue-squash PRs the Commit Queue should land as one squashed commit. doc Issues and PRs related to Node.js documentation.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

7 participants

@legendecas @nodejs-github-bot @lpinca @MoLow @mhdawson @aduh95 @RafaelGSS
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.