From ed1b6dcaf1a3aaf6a357258685f5258632bcc42d Mon Sep 17 00:00:00 2001 From: Grey Baker Date: Sun, 25 Oct 2020 09:50:56 +0000 Subject: [PATCH 1/2] Add note to merge commit email selector about rebase and squash merges --- .../merging-a-pull-request.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md b/content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md index 2e3d0f54367a..bfac11f5c938 100644 --- a/content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md +++ b/content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md @@ -45,9 +45,15 @@ If you decide you don't want the changes in a topic branch to be merged to the u {% data reusables.files.choose-commit-email %} + {% note %} + + **Note:** The email selector is not available for rebase merges, which do not create a merge commit, or for squash merges, which credit the user who created the pull request as the author of the squashed commit. + + {% endnote %} + 6. Click **Confirm merge**, **Confirm squash and merge**, or **Confirm rebase and merge**. 6. Optionally, [delete the branch](/articles/deleting-unused-branches). This keeps the list of branches in your repository tidy. - + The repository may be configured so that the head branch for a pull request is automatically deleted when you merge a pull request. For more information, see "[Managing the automatic deletion of branches](/github/administering-a-repository/managing-the-automatic-deletion-of-branches)." {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} From cd36152a7c5af4657dc327532a98b1d9967b121c Mon Sep 17 00:00:00 2001 From: hubwriter <54933897+hubwriter@users.noreply.github.com> Date: Thu, 29 Oct 2020 10:47:49 +0000 Subject: [PATCH 2/2] Update content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md --- .../merging-a-pull-request.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md b/content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md index bfac11f5c938..e48e04f595bb 100644 --- a/content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md +++ b/content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md @@ -45,11 +45,11 @@ If you decide you don't want the changes in a topic branch to be merged to the u {% data reusables.files.choose-commit-email %} - {% note %} + {% note %} - **Note:** The email selector is not available for rebase merges, which do not create a merge commit, or for squash merges, which credit the user who created the pull request as the author of the squashed commit. + **Note:** The email selector is not available for rebase merges, which do not create a merge commit, or for squash merges, which credit the user who created the pull request as the author of the squashed commit. - {% endnote %} + {% endnote %} 6. Click **Confirm merge**, **Confirm squash and merge**, or **Confirm rebase and merge**. 6. Optionally, [delete the branch](/articles/deleting-unused-branches). This keeps the list of branches in your repository tidy.