Skip to content

Commit

Permalink
Merge pull request #16585 from issyl0/rm-ancient-flowchart
Browse files Browse the repository at this point in the history
Delete ancient 'managing PRs' flowchart
  • Loading branch information
issyl0 authored Feb 5, 2024
2 parents 6170b62 + a8beb98 commit dbb10da
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 57 deletions.
5 changes: 0 additions & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ trim_trailing_whitespace = true
# trailing whitespace is crucial for patches
trim_trailing_whitespace = false

[**.drawio.svg]
indent_size = unset
indent_style = unset
insert_final_newline = false

[**.md]
trim_trailing_whitespace = true
x-soft-wrap-text = true
45 changes: 0 additions & 45 deletions docs/Diagram-Guidelines.md

This file was deleted.

6 changes: 1 addition & 5 deletions docs/Homebrew-homebrew-core-Maintainer-Guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ For most PRs that make formula modifications, you can simply approve the PR and

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.
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.

Otherwise, you should use `brew pr-pull` (or `rebase`/`cherry-pick` contributions).

Expand All @@ -35,10 +35,6 @@ Cherry-picking changes the date of the commit, which kind of sucks.

Don’t `merge` unclean branches. So if someone is still learning `git` and their branch is filled with nonsensical merges, then `rebase` and squash the commits. Our main branch history should be useful to other people, not confusing.

Here’s a flowchart for managing a PR which is ready to merge:

![Flowchart for managing pull requests](assets/img/docs/managing-pull-requests.drawio.svg)

Only one maintainer is necessary to approve and merge the addition of a new or updated formula which passes CI. However, if the formula addition or update proves controversial the maintainer who adds it will be expected to answer requests and fix problems that arise with it in future.

### How to merge without bottles
Expand Down
1 change: 0 additions & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
- [Building Against Non-Homebrew Dependencies](Building-Against-Non-Homebrew-Dependencies.md)
- [How to Create and Maintain a Tap](How-to-Create-and-Maintain-a-Tap.md)
- [Brew Test Bot](Brew-Test-Bot.md)
- [Diagram Guidelines](Diagram-Guidelines.md)
- [Prose Style Guidelines](Prose-Style-Guidelines.md)
- [Type Checking with Sorbet](Typechecking.md)
- [Reproducible Builds](Reproducible-Builds.md)
Expand Down
1 change: 0 additions & 1 deletion docs/assets/img/docs/managing-pull-requests.drawio.svg

This file was deleted.

0 comments on commit dbb10da

Please sign in to comment.