diff --git a/content/github/administering-a-repository/configuring-pull-request-merges/managing-auto-merge-for-pull-requests-in-your-repository.md b/content/github/administering-a-repository/configuring-pull-request-merges/managing-auto-merge-for-pull-requests-in-your-repository.md index 5e151d9843..d436c2430f 100644 --- a/content/github/administering-a-repository/configuring-pull-request-merges/managing-auto-merge-for-pull-requests-in-your-repository.md +++ b/content/github/administering-a-repository/configuring-pull-request-merges/managing-auto-merge-for-pull-requests-in-your-repository.md @@ -18,6 +18,8 @@ If you allow auto-merge for pull requests in your repository, people with write ### Managing auto-merge +{% data reusables.pull_requests.auto-merge-requires-branch-protection %} + {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} 1. Under "Merge button", select or deselect **Allow auto-merge**. diff --git a/content/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request.md b/content/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request.md index b919acd765..be4fc80e0a 100644 --- a/content/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request.md +++ b/content/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request.md @@ -24,6 +24,8 @@ You can provide feedback about auto-merge by [contacting us](https://support.git ### Enabling auto-merge +{% data reusables.pull_requests.auto-merge-requires-branch-protection %} + People with write permissions to a repository can enable auto-merge for a pull request. {% data reusables.repositories.navigate-to-repo %} diff --git a/data/reusables/pull_requests/auto-merge-requires-branch-protection.md b/data/reusables/pull_requests/auto-merge-requires-branch-protection.md new file mode 100644 index 0000000000..b8de0a7dba --- /dev/null +++ b/data/reusables/pull_requests/auto-merge-requires-branch-protection.md @@ -0,0 +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)." + +{% endnote %}