jprdonnelly/docs
1
0
Fork 0
mirror of synced 2026-01-30 06:01:34 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6809 from github/repo-sync

Browse Source 
repo sync
This commit is contained in:
Octomerger Bot
2021-05-27 04:20:40 +10:00
committed by GitHub
parent acb90399d8 b30a772e15
commit 8ac386efbb
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
content/github/administering-a-repository/configuring-pull-request-merges/managing-auto-merge-for-pull-requests-in-your-repository.md
View File

@@ -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**.

2
content/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request.md
View File

@@ -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 %}

5
data/reusables/pull_requests/auto-merge-requires-branch-protection.md Normal file
View File

@@ -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 %}