Skip to content

Commit 6011832

Browse files
authored
Merge pull request #12084 from github/repo-sync
repo sync
2 parents b35bb2b + 98c74b7 commit 6011832

4 files changed

Lines changed: 10 additions & 8 deletions

File tree

2.89 KB
Loading

content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,7 @@ Before you can enable required status checks, you must configure the repository
8787

8888
After enabling required status checks, all required status checks must pass before collaborators can merge changes into the protected branch. After all required status checks pass, any commits must either be pushed to another branch and then merged or pushed directly to the protected branch.
8989

90-
{% note %}
91-
92-
**Note:** Any person or integration with write permissions to a repository can set the state of any status check in the repository. {% data variables.product.company_short %} does not verify that the author of a check is authorized to create a check with a certain name or modify an existing status. Before merging a pull request, you should verify that the author of each status, listed in the merge box, is expected.
93-
94-
{% endnote %}
90+
Any person or integration with write permissions to a repository can set the state of any status check in the repository, but in some cases you may only want to accept a status check from a specific {% data variables.product.prodname_github_app %}. When you add a required status check, you can select an app that has recently set this check as the expected source of status updates. If the status is set by any other person or integration, merging won't be allowed. If you select "any source", you can still manually verify the author of each status, listed in the merge box.
9591

9692
You can set up required status checks to either be "loose" or "strict." The type of required status check you choose determines whether your branch is required to be up to date with the base branch before merging.
9793

content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@ When you create a branch rule, the branch you specify doesn't have to exist yet
6969
![Require review from code owners](/assets/images/help/repository/PR-review-required-code-owner.png)
7070
- Optionally, if the repository is part of an organization, select **Restrict who can dismiss pull request reviews**. Then, search for and select the people or teams who are allowed to dismiss pull request reviews. For more information, see "[Dismissing a pull request review](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/dismissing-a-pull-request-review)."
7171
![Restrict who can dismiss pull request reviews checkbox](/assets/images/help/repository/PR-review-required-dismissals.png)
72-
1. Optionally, enable required status checks.
72+
1. Optionally, enable required status checks. For more information, see "[About status checks](/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks)."
7373
- Select **Require status checks to pass before merging**.
7474
![Required status checks option](/assets/images/help/repository/required-status-checks.png)
7575
- Optionally, to ensure that pull requests are tested with the latest code on the protected branch, select **Require branches to be up to date before merging**.
7676
![Loose or strict required status checkbox](/assets/images/help/repository/protecting-branch-loose-status.png)
77-
- From the list of available status checks, select the checks you want to require.
78-
![List of available status checks](/assets/images/help/repository/required-statuses-list.png)
77+
- Search for status checks, selecting the checks you want to require.
78+
![Search interface for available status checks, with list of required checks](/assets/images/help/repository/required-statuses-list.png)
7979
{%- ifversion fpt or ghes > 3.1 or ghae-issue-4382 %}
8080
1. Optionally, select **Require conversation resolution before merging**.
8181
![Require conversation resolution before merging option](/assets/images/help/repository/require-conversation-resolution.png)

content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,9 @@ Sometimes, the results of the status checks for the test merge commit and head c
4242

4343
![Branch with conflicting merge commits](/assets/images/help/repository/req-status-check-conflicting-merge-commits.png)
4444
{% endif %}
45+
46+
It's also possible for a protected branch to require a status check from a specific {% data variables.product.prodname_github_app %}. If you see a message similar to the following, then you should verify that the check listed in the merge box was set by the expected app.
47+
48+
```
49+
Required status check "build" was not set by the expected {% data variables.product.prodname_github_app %}.
50+
```

0 commit comments

Comments
 (0)