diff --git a/assets/images/help/pull_requests/confirm-auto-merge-button.png b/assets/images/help/pull_requests/confirm-auto-merge-button.png deleted file mode 100644 index 1ec0d1023456..000000000000 Binary files a/assets/images/help/pull_requests/confirm-auto-merge-button.png and /dev/null differ diff --git a/assets/images/help/pull_requests/pull-request-information-fields-enterprise.png b/assets/images/help/pull_requests/pull-request-information-fields-enterprise.png new file mode 100644 index 000000000000..083da7eb9bdd Binary files /dev/null and b/assets/images/help/pull_requests/pull-request-information-fields-enterprise.png differ diff --git a/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request.md b/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request.md index 572bfa071420..a1cdd0b320ad 100644 --- a/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request.md +++ b/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request.md @@ -38,10 +38,20 @@ People with write permissions to a repository can enable auto-merge for a pull r !["Enable auto-merge" drop-down menu](/assets/images/help/pull_requests/enable-auto-merge-drop-down.png) 1. Click **Enable auto-merge**. ![Button to enable auto-merge](/assets/images/help/pull_requests/enable-auto-merge-button.png) + {% ifversion fpt %} 1. If you chose the merge or squash and merge methods, type a commit message and description and choose the email address you want to author the merge commit. ![Fields to enter commit message and description and choose commit author email](/assets/images/help/pull_requests/pull-request-information-fields.png) + {% note %} + + **Note:** The email dropdown menu is not available if you have email privacy enabled or if you only have one verified and visible email associated with your {% data variables.product.company_short %} account. + + {% endnote %} + {% endif %} + {% ifversion ghes > 3.0 or ghae or ghec %} +1. If you chose the merge or squash and merge methods, type a commit message and description. + ![Fields to enter commit message and description](/assets/images/help/pull_requests/pull-request-information-fields-enterprise.png) + {% endif %} 1. Click **Confirm auto-merge**. - ![Button to confirm auto-merge](/assets/images/help/pull_requests/confirm-auto-merge-button.png) ## Disabling auto-merge diff --git a/data/reusables/pull_requests/auto-merge-requires-branch-protection.md b/data/reusables/pull_requests/auto-merge-requires-branch-protection.md index b8de0a7dbab8..c70180f9add8 100644 --- a/data/reusables/pull_requests/auto-merge-requires-branch-protection.md +++ b/data/reusables/pull_requests/auto-merge-requires-branch-protection.md @@ -1,5 +1,5 @@ {% note %} -**Note**: the option to enable auto-merge is shown only on pull requests that cannot be merged immediately. For example, when a branch protection rule enforces "Require pull request reviews before merging" or "Require status checks to pass before merging" and these conditions are not yet met. For more information, see "[Managing a branch protection rule](/github/administering-a-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule)." +**Note**: The option to enable auto-merge is shown only on pull requests that cannot be merged immediately. For example, when a branch protection rule enforces "Require pull request reviews before merging" or "Require status checks to pass before merging" and these conditions are not yet met. For more information, see "[Managing a branch protection rule](/github/administering-a-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule)." {% endnote %}