diff --git a/.mergify.yml b/.mergify.yml index 278daf3d80..90d1c93e64 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -28,7 +28,7 @@ pull_request_rules: - 'status-failure=build' actions: comment: - message: 'Unfortunately the automatic code review has failed. Please click the details button for more information. If the details reveal a fail in Danger please note that there is currently a known issue (\#2046) and @dkundel will merge your PR manually in the coming days. Sorry for the inconvenience.' + message: 'Unfortunately the automatic code review has failed. Please click the details button for more information. If the details reveal a fail in Danger please note that there is currently a known issue (\#2046) and @rmkubik will merge your PR manually in the coming days. Sorry for the inconvenience.' label: add: - 'needs-help' @@ -37,7 +37,7 @@ pull_request_rules: - '#files>=2' actions: comment: - message: 'This PR touches more than one file and has to be reviewed manually. @dkundel' + message: 'This PR touches more than one file and has to be reviewed manually. @rmkubik' label: add: - 'needs-review' diff --git a/docs/MAINTAINERS.md b/docs/MAINTAINERS.md index 50e0b6791f..3ba18f63ef 100644 --- a/docs/MAINTAINERS.md +++ b/docs/MAINTAINERS.md @@ -4,18 +4,8 @@ The following people are the current maintainers. Feel free to reach out to them for any questions. -- [Dominik Kundel @dkundel](https://github.com/dkundel) +- [Ryan Kubik @rmkubik](https://github.com/rmkubik) - Pronouns: he/him - - Twitter: [@dkundel](https://twitter.com/dkundel) - - Email: [dkundel@twilio.com](mailto:dkundel@twilio.com) -- [Tilde Ann Thurium @annthurium](https://github.com/annthurium) - - Pronouns: they/them - - Twitter: [@annthurium](https://twitter.com/annthurium) - - Email: [tthurium@twilio.com](mailto:tthurium@twilio.com) -- [Lizzie Siegle @elizabethsiegle](https://github.com/elizabethsiegle) - - Pronouns: she/her - - Twitter: [@lizziepika](https://twitter.com/lizziepika) - - Email: [lsiegle@twilio.com](mailto:lsiegle@twilio.com) ## Process Steps For Maintainers @@ -33,11 +23,11 @@ These are some guides on how to deal with those PRs - there should not be any other files touched - the coordinates of the pixel should be less than `40` - if this is the case, you can use the following message template to request changes - > Hey @dkundel it seems like that someone unfortunately already grabbed the pixel you are trying to contribute. Could you please [sync your fork](https://help.github.com/en/articles/syncing-a-fork) or run `npm run sync-fork` and contribute a different pixel instead? Thank you for your contribution! + > Hey @rmkubik it seems like that someone unfortunately already grabbed the pixel you are trying to contribute. Could you please [sync your fork](https://help.github.com/en/articles/syncing-a-fork) or run `npm run sync-fork` and contribute a different pixel instead? Thank you for your contribution! - the `username` should be the same as their GitHub username they are using to open the PR - they are not overriding another person's pixel - if this is the case, you can use the following message template to request changes - > Hey @dkundel it seems like that you grabbed the pixel that is outside of the canvas. Any coordinate needs to be smaller than 40. Could you please [sync your fork](https://help.github.com/en/articles/syncing-a-fork) or run `npm run sync-fork` and contribute a different pixel instead? Thank you for your contribution! + > Hey @rmkubik it seems like that you grabbed the pixel that is outside of the canvas. Any coordinate needs to be smaller than 40. Could you please [sync your fork](https://help.github.com/en/articles/syncing-a-fork) or run `npm run sync-fork` and contribute a different pixel instead? Thank you for your contribution! 3. Check if the PR has a merge conflict. You can see it at the bottom of the page. If there is a merge conflict: 1. Press the `Resolve conflict` button 2. Generally press `Accept Current`. The only exception is if the conflict involves the user who created the PR. In that case: