Skip to content

Commit

Permalink
Added versioning and note for auto-merge email (github#25423)
Browse files Browse the repository at this point in the history
- Added versioning and note for auto-merge email
- Fixed list numbering
- Fixed note syntax I broke when fixing the list
- Removed image and replaced GitHub text with variable
  • Loading branch information
dihydroJenoxide committed Feb 16, 2022
1 parent 82af6ba commit 3ffd17b
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 2 deletions.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -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 %}

0 comments on commit 3ffd17b

Please sign in to comment.