Skip to content
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

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

Merged
merged 4 commits into from
Jul 15, 2023
Merged

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

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4cdc3c0
doc: expand on squashing and rebasing to land a PR
legendecas Jul 13, 2023
d3ae12c
fixup! doc: expand on squashing and rebasing to land a PR
legendecas Jul 13, 2023
45f80af
fixup! doc: expand on squashing and rebasing to land a PR
legendecas Jul 13, 2023
0c4e188
fixup! doc: expand on squashing and rebasing to land a PR
legendecas Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions doc/contributing/collaborator-guide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,12 @@ For pull requests from first-time contributors, be
[welcoming](#welcoming-first-time-contributors). Also, verify that their git
settings are to their liking.

If the pull request contains more than one commits, it can be landed with
aduh95 marked this conversation as resolved.
Show resolved Hide resolved
squashing into one commit or rebasing all the commits. Generally, a
aduh95 marked this conversation as resolved.
Show resolved Hide resolved
collaborator should land the pull request with squashing. If the pull request
has more than one self-contained subsystem commits, a collaborator may land it
with rebasing.

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.

Expand Down