ci/github-script/merge: clarify Auto Merge follow-up tip

The previous tip ("Sometimes GitHub gets stuck after enabling Auto Merge") didn't explain why nothing happens immediately after the bot's "Enabled Auto Merge" reply, leaving maintainers unsure whether to wait or intervene. Spell out that Auto Merge waits for required CI before queueing, that a later CI failure leaves the PR un-queued until it is fixed, and link to GitHub's documentation; keep the existing "leave another approval" workaround for the rare cases where Auto Merge stalls after CI completes. Assisted-by: claude-code with claude-opus-4-8[1m]-high
2026-06-25 18:05:32 +03:00
parent b94b44d3f9
commit 6f9325fb5d
1 changed files with 3 additions and 1 deletions
@@ -292,7 +292,9 @@ async function handleMerge({
          `:heavy_check_mark: Enabled Auto Merge (#306934)`,
          '',
          '> [!TIP]',
-          '> Sometimes GitHub gets stuck after enabling Auto Merge. In this case, leaving another approval should trigger the merge.',
+          '> [Auto Merge](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request) will queue this PR once required CI checks succeed.',
+          '> If CI fails instead, fixing it needs a new push, which disables Auto Merge and invalidates this command — comment `@NixOS/nixpkgs-merge-bot merge` again once CI is green.',
+          '> If GitHub gets stuck even though CI passed (it sometimes does), leaving another approval should kick off the merge.',
        ],
      }
    } catch (e) {