From 8edd4d3facdf6384f624380036440ff7378ba134 Mon Sep 17 00:00:00 2001 From: Rylan Polster Date: Wed, 19 May 2021 12:50:34 -0400 Subject: [PATCH] docs: cleanup core merge info --- docs/Homebrew-homebrew-core-Merge-Checklist.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/Homebrew-homebrew-core-Merge-Checklist.md b/docs/Homebrew-homebrew-core-Merge-Checklist.md index 31fec5c9c8..1073223919 100644 --- a/docs/Homebrew-homebrew-core-Merge-Checklist.md +++ b/docs/Homebrew-homebrew-core-Merge-Checklist.md @@ -29,10 +29,14 @@ be in Homebrew Cask instead. ## Merging, rebasing, cherry-picking -In most cases, you can simply approve a PR and an automatic merge (with bottles) -will be performed by [@BrewTestBot](https://github.com/BrewTestBot). +For most PRs that make formula modifications, you can simply approve the PR and an automatic +merge (with bottles) will be performed by [@BrewTestBot](https://github.com/BrewTestBot). See [Brew Test Bot For Core Contributors](Brew-Test-Bot-For-Core-Contributors.md) for more information. +Certain PRs may not be merged automatically by [@BrewTestBot](https://github.com/BrewTestBot), +even after they've been approved. This includes PRs with the `new formula`, `automerge-skip`, +and `linux-only` labels. To trigger a merge for these PRs, run `brew pr-publish`. + PRs modifying formulae that don't need bottles or making changes that don't require new bottles to be pulled should use GitHub's squash & merge or rebase & merge workflows. See the [table below](#how-to-merge-without-bottles) for more details.