From eb5b699bcc3c1fa4ef79c11c20f1b2124ed43d5c Mon Sep 17 00:00:00 2001 From: adjn <104127038+adjn@users.noreply.github.com> Date: Tue, 20 Jun 2023 07:26:14 -0700 Subject: [PATCH] Update troubleshooting-required-status-checks.md (#36692) Co-authored-by: Kynan Ware <47394200+BagToad@users.noreply.github.com> Co-authored-by: mc <42146119+mchammer01@users.noreply.github.com> Co-authored-by: Sophie <29382425+sophietheking@users.noreply.github.com> --- .../troubleshooting-required-status-checks.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/troubleshooting-required-status-checks.md b/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/troubleshooting-required-status-checks.md index 4b1a1ef95f..b9106b9e9a 100644 --- a/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/troubleshooting-required-status-checks.md +++ b/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/troubleshooting-required-status-checks.md @@ -39,7 +39,9 @@ remote: error: Required status check "ci-build" is failing ## Conflicts between head commit and test merge commit -Sometimes, the results of the status checks for the test merge commit and head commit will conflict. If the test merge commit has a status, the test merge commit must pass. Otherwise, the status of the head commit must pass before you can merge the branch. For more information about test merge commits, see "[AUTOTITLE](/rest/pulls#get-a-pull-request)." +Sometimes, the results of the status checks for the test merge commit and head commit will conflict. If the test merge commit has a status, the test merge commit must pass. Otherwise, the status of the head commit must pass before you can merge the branch. + +If there is a conflict between the test merge commit and head commit, the checks for the test merge commit are shown in the pull request status checks box. This is indicated in the pull request status box by a line starting with `Showing checks for the merge commit`. For more information about test merge commits, see "[AUTOTITLE](/rest/pulls#get-a-pull-request)." ## Handling skipped but required checks