admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

docs: further clarify merging workflows

Browse Source 
Co-Authored-By: Sam Ford <1584702+samford@users.noreply.github.com>
This commit is contained in:
Rylan Polster 2020-12-30 21:12:45 -05:00
parent bca13a4926
commit b605b3ebe5
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/Maintainer-Guidelines.md
View File

@ -61,9 +61,12 @@ We now accept versioned formulae as long as they [meet the requirements](Version
### Merging, rebasing, cherry-picking
Merging should be done in the `Homebrew/brew` repository to preserve history & GPG commit signing,
and squash/merge or rebase/merge via GitHub should be used for formulae where those formulae
don't need bottles or the change does not require new bottles to be pulled.
Merging should be done in the `Homebrew/brew` repository to preserve history & GPG commit signing.
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.
Otherwise, you should use `brew pr-pull` (or `rebase`/`cherry-pick` contributions).
Don’t `rebase` until you finally `push`. Once `master` is pushed, you can’t