Skip to content

Commit 58f5d11

Browse files
authored
Update guide-changes.md (#29968)
Remove or update outdated contents. ### Checklist - [ ] This PR has adequate test coverage / QA involvement has been duly considered. ([trigger-ci for additional test/nightly runs](https://trigger-ci.dev.materialize.com/)) - [ ] This PR has an associated up-to-date [design doc](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/design/README.md), is a design doc ([template](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/design/00000000_template.md)), or is sufficiently small to not require a design. <!-- Reference the design in the description. --> - [ ] If this PR evolves [an existing `$T ⇔ Proto$T` mapping](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/command-and-response-binary-encoding.md) (possibly in a backwards-incompatible way), then it is tagged with a `T-proto` label. - [ ] If this PR will require changes to cloud orchestration or tests, there is a companion cloud PR to account for those changes that is tagged with the release-blocker label ([example](MaterializeInc/cloud#5021)). <!-- Ask in #team-cloud on Slack if you need help preparing the cloud PR. --> - [ ] If this PR includes major [user-facing behavior changes](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/guide-changes.md#what-changes-require-a-release-note), I have pinged the relevant PM to schedule a changelog post.
1 parent 79fa862 commit 58f5d11

File tree

1 file changed

+1
-23
lines changed

1 file changed

+1
-23
lines changed

doc/developer/guide-changes.md

+1-23
Original file line numberDiff line numberDiff line change
@@ -487,16 +487,7 @@ In very rare cases, it may be necessary to merge a PR whose tests are failing.
487487
This situation typically only occurs with chicken-and-egg CI configuration
488488
issues, where PR builds are broken until a fix can be merged to `main`.
489489
490-
To perform a "god mode" merge, you can temporarily lift the branch restrictions
491-
on the `main` branch. Navigate to the [branch protection rules for the `main`
492-
branch][branch-protection] and uncheck the "Include administrators" box. Do
493-
*not* delete the rules or uncheck any other boxes, as it is much harder to
494-
reverse those changes.
495-
496-
Your PR will be mergeable after you uncheck the "Include administrators" box,
497-
though you will have to click through several warning screens. Once the PR is
498-
merged, be sure to re-enable the "Include administrators" setting to prevent
499-
accidents.
490+
Only a few people have sufficient access, inquire in Slack if this situation arises.
500491
501492
## Reviewing changes
502493
@@ -936,19 +927,6 @@ submit a PR to fix it!
936927
* Accept PRs that improve the overall health of the codebase, even if they
937928
are not perfect.
938929

939-
## Common Issues
940-
941-
### Stuck CLA check
942-
943-
Taken from the [cla-assistant `README.md`](https://github.com/cla-assistant/cla-assistant/blob/main/COMMON_ISSUES.md#cla-assistant-status-or-comment-not-updated-1).
944-
945-
Sometimes it happens that while you signed the CLA the status doesn't get updated.
946-
Might be a technical issue or some other problem. Most temporary issues can be solved by manually triggering a new check with navigating to
947-
```
948-
https://cla-assistant.io/check/<orgname>/<reponame>?pullRequest=<pr_number>
949-
```
950-
replacing `<orgname>`, `<reponame>` and `<pr_number>` with your respective values.
951-
952930
[`29f8f46b9`]: https://github.com/MaterializeInc/materialize/commit/29f8f46b92280071c96b294d414675aa626f9403
953931
[#3808]: https://github.com/MaterializeInc/materialize/pull/3808
954932
[#3982]: https://github.com/MaterializeInc/materialize/pull/3982

0 commit comments

Comments
 (0)