forked from twilio-labs/open-pixel-art
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
5 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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: [[email protected]](mailto:[email protected]) | ||
- [Tilde Ann Thurium @annthurium](https://github.com/annthurium) | ||
- Pronouns: they/them | ||
- Twitter: [@annthurium](https://twitter.com/annthurium) | ||
- Email: [[email protected]](mailto:[email protected]) | ||
- [Lizzie Siegle @elizabethsiegle](https://github.com/elizabethsiegle) | ||
- Pronouns: she/her | ||
- Twitter: [@lizziepika](https://twitter.com/lizziepika) | ||
- Email: [[email protected]](mailto:[email protected]) | ||
|
||
## 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: | ||
|