Skip to content
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.

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

Update CONTRIBUTING.md to Contributor Covenant v1.4 #661

Merged
merged 1 commit into from
Apr 2, 2016
Merged

Update CONTRIBUTING.md to Contributor Covenant v1.4 #661

merged 1 commit into from
Apr 2, 2016

Conversation

shiftkey
Copy link

Opening this up to start a discussion about updating and adapting the CC template, which feels more succinct than what was previously provided.

Rendered Markdown

I'll have another read over what was covered in #200 to see what changes might need to be re-applied but let me know how this feels to the contributors, so we can tweak it to suit our situation.

Using the baseline template as a starting point, retained the opening header and ported the previous email address from the existing template
@dscho
Copy link
Member

dscho commented Feb 18, 2016

Thank you so much! I like it.

Let's wait a couple of days for other contributors to chime in, okay?

@PhilipOakley
Copy link

I commented on the previous Code of Conduct.

This CoC feels more balanced than previous versions.

A general issue I have is that most of these CoC's have good intentions but often expect a level of individual perfection that we rarely live up to. Users write poor issue reports, don't provide MVCE's, and don't confirm if fixes work. Meanwhile maintainer(s) are over worked, under supported and under appreciated.

A key area that isn't covered is Tolerance. We should be able to tolerate diversity, difference, and annoyance. We should be helpful, supportive, and educational.

The other problem is that on-line, many of the features being highlighted can't be observed anyway, and some are contradictory.

Users who have an indeterminate username have no colour, creed, age, body size, etc. It is the use of such terms that can be a cause for harrassment. Use of such terms are not a part of code & documentation review.

The opposite problem is when some user does have a disability that means thay are not fully aware of how their post may be read. They may use words which other find offensive, or ask to participate in something inappropriate. The problem here is in discerning (usually not in a fully open forum) if the user is being deliberate (trolling) or just unaware (a disability). [I have recently had just that issue at another club where new members were not aware of the circumstances of an older lapsed member and misunderstood their new facebook posts].

Philip

@dscho
Copy link
Member

dscho commented Feb 22, 2016

@PhilipOakley thank you for your thoughtful comments!

most of these CoC's have good intentions but often expect a level of individual perfection that we rarely live up to.

Our current CoC says: "be friendly". It was my naive impression that this would cover being tolerant of one's own, and others', shortcomings...

The proposed update contains similar language: "Showing empathy towards other community members"

If you truly aim for showing empathy, you may assume that there are adverse circumstances that did not let the contributor know how good reports are written (this has been much improved using the issue reporting template contributed by @shiftkey, of course).

Users who have an indeterminate username have no colour, creed, age, body size, etc. It is the use of such terms that can be a cause for harrassment.

I disagree. It is not an invitation for harrassment if I choose a username that reveals details about myself.

The opposite problem is when some user does have a disability that means thay are not fully aware of how their post may be read. They may use words which other find offensive, or ask to participate in something inappropriate.

From my vantage point, you describe a very good reason why we need a Code of Conduct. It is good to have a document describing the standard for which we strive.

Just to make sure we're on the same page: the Code of Conduct is not a policing document. I do not want to take it to "club down" somebody who behaved inappropriately, nor would I want anybody else to do that. Instead, in my mind the Code of Conduct should be a document that simply states what we expect of others and of ourselves, in order to steer towards a diverse, strong community. The goal is the latter, the means is the Code of Conduct (and/or anything else that helps to reach that goal).

@PhilipOakley
Copy link

@dscho, thanks, I waited to see if others had anything to say, and to give time for reflection.

I did want to ensure that we expressly covered some of the points I mentioned, as they have a habit of being missed by those that haven't thought (or been told about) them.

The proposed update contains similar language "Showing empathy towards other community members"

Perhaps "Showing empathy and tolerance towards other community members" ?

This would (if read and internalised) positively tell folks of the expectations. I do see tolerance and empathy as distinct attributes.

I disagree

On the harassment point; Sorry for the confusion and misunderstanding on this one.

The aspect I was trying to pick out was regarding what constitutes harassment, rather than any specific characteristics of the person being harassed (publicly identified or not).

Clearly, as you pointed out, the harassment can be through a perceived common characteristic, but equally the harassing characteristic may not be (i.e. figurative, not literal). And such harassment is wrong in both cases.

...the Code of Conduct should be a document that simply states what we expect of others and of ourselves ...

I'd go half a step further and say it should "positively" state our expectations where it needs to. Finding that clarity in these type of documents is tricky.

@dscho
Copy link
Member

dscho commented Mar 2, 2016

I do see tolerance and empathy as distinct attributes.

I do, too. Yet there are sometimes good reasons not to show tolerance, e.g. when some comments are unnecessarily harsh or inflammatory. In fact, the Code of Conduct requires me to be intolerant in that case.

I'd go half a step further and say it should "positively" state our expectations where it needs to. Finding that clarity in these type of documents is tricky.

Maybe we can leave it at a "good enough" state and go back to coding? 😄

@dscho dscho changed the title [WIP] update CONTRIBUTING.md to Contributor Covenant v1.4 Update CONTRIBUTING.md to Contributor Covenant v1.4 Apr 2, 2016
@dscho dscho merged commit 71c3301 into git-for-windows:master Apr 2, 2016
dscho added a commit to git-for-windows/build-extra that referenced this pull request Apr 2, 2016
The Git for Windows project updated its
contributor guidelines to the [Contributor Covenant
1.4](git-for-windows/git#661).

Signed-off-by: Johannes Schindelin <[email protected]>
@YueLinHo
Copy link

YueLinHo commented Apr 8, 2016

@dscho Is it good to add Git for Windows into the adopters list of CoC?

The patch

diff --git a/adopters/index.html b/adopters/index.html
index e2c950f..6cba725 100644
--- a/adopters/index.html
+++ b/adopters/index.html
@@ -71,6 +71,7 @@
            <li><a href="https://github.com/exercism/exercism.io">Exercism.io</a></li>
            <li><a href="https://github.com/freedomotic/freedomotic">Freedomotic</a></li>
            <li><a href="https://gitlab.com/coraline/fukuzatsu/tree/master">Fukuzatsu</a></li>
+           <li><a href="https://github.com/git-for-windows">Git for Windows</a></li>
            <li><a href="https://github.com/gitlabhq/gitlabhq">GitLab</a></li>
            <li><a href="https://github.com/ruby-grape/grape">Grape</a></li>
            <li><a href="https://github.com/growingdevs/growingdevs.github.io">Growing Devs</a></li>

@dscho
Copy link
Member

dscho commented Apr 8, 2016

@YueLinHo Sure!

@YueLinHo
Copy link

Sorry for the late.

See EthicalSource/contributor_covenant#382

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants