From 4d353ad7ae51731bdb88b5ce69b471f15d543823 Mon Sep 17 00:00:00 2001 From: brian-armory <53799971+brian-armory@users.noreply.github.com> Date: Tue, 26 Jan 2021 14:31:05 -0800 Subject: [PATCH 1/2] remove hyphen in label to match UI addresses https://github.com/github/docs/issues/3215 --- .../administering-a-repository/about-protected-branches.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/github/administering-a-repository/about-protected-branches.md b/content/github/administering-a-repository/about-protected-branches.md index a7a826705fc6..425fc4a2a584 100644 --- a/content/github/administering-a-repository/about-protected-branches.md +++ b/content/github/administering-a-repository/about-protected-branches.md @@ -86,8 +86,8 @@ You can set up required status checks to either be "loose" or "strict." The type | Type of required status check | Setting | Merge requirements | Considerations | | --- | --- | --- | --- | -| **Strict** | The **Require branches to be up-to-date before merging** checkbox is checked. | The branch **must** be up to date with the base branch before merging. | This is the default behavior for required status checks. More builds may be required, as you'll need to bring the head branch up to date after other collaborators merge pull requests to the protected base branch.| -| **Loose** | The **Require branches to be up-to-date before merging** checkbox is **not** checked. | The branch **does not** have to be up to date with the base branch before merging. | You'll have fewer required builds, as you won't need to bring the head branch up to date after other collaborators merge pull requests. Status checks may fail after you merge your branch if there are incompatible changes with the base branch. | +| **Strict** | The **Require branches to be up to date before merging** checkbox is checked. | The branch **must** be up to date with the base branch before merging. | This is the default behavior for required status checks. More builds may be required, as you'll need to bring the head branch up to date after other collaborators merge pull requests to the protected base branch.| +| **Loose** | The **Require branches to be up to date before merging** checkbox is **not** checked. | The branch **does not** have to be up to date with the base branch before merging. | You'll have fewer required builds, as you won't need to bring the head branch up to date after other collaborators merge pull requests. Status checks may fail after you merge your branch if there are incompatible changes with the base branch. | | **Disabled** | The **Require status checks to pass before merging** checkbox is **not** checked. | The branch has no merge restrictions. | If required status checks aren't enabled, collaborators can merge the branch at any time, regardless of whether it is up to date with the base branch. This increases the possibility of incompatible changes. For troubleshooting information, see "[Troubleshooting required status checks](/github/administering-a-repository/troubleshooting-required-status-checks)." From 4d419df496abe9ca2193741db4062ecd5868db92 Mon Sep 17 00:00:00 2001 From: brian-armory <53799971+brian-armory@users.noreply.github.com> Date: Thu, 28 Jan 2021 19:52:36 -0800 Subject: [PATCH 2/2] remove `-` on another up to date --- .../administering-a-repository/about-protected-branches.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/github/administering-a-repository/about-protected-branches.md b/content/github/administering-a-repository/about-protected-branches.md index 425fc4a2a584..c842929a11b3 100644 --- a/content/github/administering-a-repository/about-protected-branches.md +++ b/content/github/administering-a-repository/about-protected-branches.md @@ -82,7 +82,7 @@ After enabling required status checks, all required status checks must pass befo {% endnote %} -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. +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. | Type of required status check | Setting | Merge requirements | Considerations | | --- | --- | --- | --- |