Skip to content

Make opening of Code of Conduct more friendly #1089

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 14, 2019
Merged

Make opening of Code of Conduct more friendly #1089

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bf4bb7d
Revamp CoC preamble and encouraged section
rkuhn Oct 27, 2019
7144d37
remove ambiguous term “micro-aggressive”
rkuhn Oct 27, 2019
c726e88
improve CoC based on PR feedback
rkuhn Oct 30, 2019
a9f90f9
add empathy to kindness and courtesy
rkuhn Oct 30, 2019
2a01c5c
Improve intro to behaviors to avoid and revert discrimination list
rkuhn Nov 2, 2019
16a0771
revert contentious changes, postponed to follow-up PR
rkuhn Nov 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions conduct.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@ As a member of the community, you agree to the following:

**Encouraged:**

- Be kind and courteous.
- Respect differences of opinion and remember that every design or implementation choice carries a trade-off and numerous costs. There is seldom a single right answer.
- Remember that everyone was new to Scala at some point. We want to encourage newcomers to join our community and learn the Scala language and ecosystem. Assume competence.
- Show empathy towards other community members.
- **Be kind and courteous.** We treat our fellow community members with the empathy, respect and dignity all humans deserve. Keep in mind that public communication is received by many people you don’t know, so before sending a message please ask yourself whether someone from a different context would misunderstand it.
- **Respect differences of opinion** and remember that every design or implementation choice carries a trade-off and numerous costs. There is seldom a single right answer; we will find the best solutions by engaging in constructive discussion, with everybody bringing their unique viewpoint and experience to the table.
- **Remember that everyone was new to Scala at some point.** We want to encourage newcomers to join our community and learn the Scala language and ecosystem. Always assume good intentions and a willingness to learn, just as you are willing to evolve your own opinion as you gain new insights.
Comment on lines +27 to +29
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also like the bolding and the expanded descriptions.

The changes to the "Encouraged" section don't seem to be controversial, and don't relate directly to the other changes. Maybe they could be merged first if they were split out to an independent pull request, while further discussion continues.


**Discouraged:**

Expand Down