jprdonnelly/docs
1
0
Fork 0
mirror of synced 2025-12-22 03:16:52 -05:00
Code Issues Projects Releases Wiki Activity

Add note to merge commit email selector about rebase and squash merges

Browse Source
This commit is contained in:
Grey Baker
2020-10-25 09:50:56 +00:00
parent 1f7580a083
commit ed1b6dcaf1
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md
View File

@@ -45,6 +45,12 @@ 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 %} {% 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. 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. 6. Optionally, [delete the branch](/articles/deleting-unused-branches). This keeps the list of branches in your repository tidy.