@@ -35,7 +35,7 @@ to enter the public source tree. Ask yourself the following questions: |
35 | 35 | Check :ref:`pull-request-lifecycle` and :ref:`helptriage` to review what |
36 | 36 | is expected of a pull request. |
37 | 37 |
|
38 | | -* **Does the change break backwards-compatibility without a strong reason?** |
| 38 | +* **Does the change break backwards compatibility without a strong reason?** |
39 | 39 | :ref:`Run the entire test suite <runtests>` to make sure that everything |
40 | 40 | still passes. If there is a change to the semantics, then there needs to |
41 | 41 | be a strong reason, because it will cause some peoples' code to break. |
@@ -79,6 +79,31 @@ to enter the public source tree. Ask yourself the following questions: |
79 | 79 | :ref:`what-s-new-and-news-entries` |
80 | 80 |
|
81 | 81 |
|
| 82 | +Merging the pull request |
| 83 | +------------------------ |
| 84 | + |
| 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 |
| 87 | +to wait for their approval even if a core team member has already approved the |
| 88 | +pull request. |
| 89 | + |
| 90 | +The CPython repo is configured to only accept squashes. You will squash the |
| 91 | +pull request. |
| 92 | + |
| 93 | +Commit message |
| 94 | +^^^^^^^^^^^^^^ |
| 95 | + |
| 96 | +CloneAGC defaults the squashed commit message to a combined list of all of the |
| 97 | +individual commit messages in the pull request. Do not leave those. They often |
| 98 | +are too noisy and provide little context, especially since devs know their |
| 99 | +work will be eventually squashed, so intermediate commit messages while |
| 100 | +working on the pull request are not interesting. |
| 101 | + |
| 102 | +If you think it is important, you can summarize the collaborative work that |
| 103 | +went into the pull request, but it is not necessary. The pull request and/or |
| 104 | +original issue are still available for detailed investigations of history. |
| 105 | + |
| 106 | + |
82 | 107 | Working with Git_ |
83 | 108 | ----------------- |
84 | 109 |
|
|
Product Launch For Small Business Credit Hold Email Template