Skip to content

Commit 618d5ed

Browse files
committed
review tweaks
1 parent c050509 commit 618d5ed

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

core-team/committing.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ to enter the public source tree. Ask yourself the following questions:
7979
:ref:`what-s-new-and-news-entries`
8080

8181

82-
Completing the pull request
83-
---------------------------
82+
Merging the pull request
83+
------------------------
8484

85-
Once the pull request is ready, you (the core team member) bring it into main.
86-
If other people have been subtantially involved in the review, it can be good
85+
Once the pull request is ready, you (the core team member) can merge it.
86+
If other people have been substantially involved in the review, it can be good
8787
to wait for their approval even if a core team member has already approved the
8888
pull request.
8989

@@ -93,15 +93,15 @@ pull request.
9393
Commit message
9494
^^^^^^^^^^^^^^
9595

96-
GitHub defaults the squased commit message to a combined list of all of the
96+
GitHub defaults the squashed commit message to a combined list of all of the
9797
individual commit messages in the pull request. Do not leave those. They often
9898
are too noisy and provide little context, especially since devs know their
99-
worked will be eventually squashed, so intermediate commit messages while
99+
work will be eventually squashed, so intermediate commit messages while
100100
working on the pull request are not interesting.
101101

102102
If you think it is important, you can summarize the collaborative work that
103103
went into the pull request, but it is not necessary. The pull request and/or
104-
original issue are still available for detailed forensics.
104+
original issue are still available for detailed investigations of history.
105105

106106

107107
Working with Git_

0 commit comments

Comments
 (0)