Skip to content

doc: expand on squashing and rebasing to land a PR #48751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 4 commits into from
Jul 15, 2023
Merged

doc: expand on squashing and rebasing to land a PR #48751

merged 4 commits into from
Jul 15, 2023

Conversation

legendecas
Copy link
Member

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

Refs: #47956 (comment)

@nodejs-github-bot
Copy link
Collaborator

Review requested:

  • @nodejs/tsc

@nodejs-github-bot nodejs-github-bot added the doc Issues and PRs related to the documentations. label Jul 13, 2023
RafaelGSS
RafaelGSS reviewed Jul 13, 2023
View reviewed changes
MoLow
MoLow approved these changes Jul 13, 2023
View reviewed changes
Copy link
Member

@MoLow MoLow left a 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 Add this label to allow the Commit Queue to land a PR in several commits. and commit-queue-squash Add this label to instruct the Commit Queue to squash all the PR commits into the first one. labels?

aduh95
aduh95 reviewed Jul 13, 2023
View reviewed changes
aduh95
aduh95 reviewed Jul 13, 2023
View reviewed changes
aduh95
aduh95 reviewed Jul 13, 2023
View reviewed changes
@lpinca lpinca added the commit-queue-squash Add this label to instruct the Commit Queue to squash all the PR commits into the first one. label Jul 14, 2023
mhdawson
mhdawson approved these changes Jul 14, 2023
View reviewed changes
Copy link
Member

@mhdawson mhdawson left a comment

Choose a reason for hiding this comment

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

LGTM

@aduh95 aduh95 added author ready PRs that have at least one approval, no pending requests for changes, and a CI started. commit-queue Add this label to land a pull request using GitHub Actions. labels Jul 14, 2023
@nodejs-github-bot nodejs-github-bot removed the commit-queue Add this label to land a pull request using GitHub Actions. label Jul 15, 2023
@nodejs-github-bot nodejs-github-bot merged commit 5da84a6 into nodejs:main Jul 15, 2023
@nodejs-github-bot
Copy link
Collaborator

Landed in 5da84a6

@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 <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>
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 <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>
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 <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>
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 <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>
@UlisesGascon UlisesGascon mentioned this pull request Aug 15, 2023
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 <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>
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 <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>
@ruyadorno ruyadorno mentioned this pull request Sep 13, 2023
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 <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>
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

@mhdawson mhdawson mhdawson approved these changes

@aduh95 aduh95 aduh95 approved these changes

@RafaelGSS RafaelGSS RafaelGSS approved these changes

Assignees

No one assigned

Labels

author ready PRs that have at least one approval, no pending requests for changes, and a CI started. commit-queue-squash Add this label to instruct the Commit Queue to squash all the PR commits into the first one. doc Issues and PRs related to the documentations.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@legendecas @nodejs-github-bot @lpinca @MoLow @mhdawson @aduh95 @RafaelGSS