Skip to content

Commit

Permalink
fixup! doc: expand on squashing and rebasing to land a PR
Browse files Browse the repository at this point in the history
  • Loading branch information
legendecas committed Jul 13, 2023
1 parent d3ae12c commit 45f80af
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions doc/contributing/collaborator-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -540,8 +540,8 @@ 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
squashing into one commit or rebasing all the commits. Generally, a
If the pull request contains more than one commit, it can be landed either by
squashing into one commit or by rebasing all the commits. Generally, a
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.
Expand Down

0 comments on commit 45f80af

Please sign in to comment.