Skip to content

Commit f505162

Browse files
committed
Fixes for linter
1 parent f40fb27 commit f505162

File tree

1 file changed

+45
-42
lines changed

1 file changed

+45
-42
lines changed

content/maintainers/managing-conflict.md

Lines changed: 45 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -7,58 +7,61 @@ This is a draft document.
77
{{< /notice >}}
88

99
### Code of Conduct
10-
It's a good idea to have a Code of Conduct to hold
11-
your community members accountable to and create a
12-
safe and inclusive space for everyone. This helps
13-
establish clear expectations on how community
14-
members should behave respectfully in their
15-
interactions with each other and serves as a
16-
reference for fair arbitration when the need
10+
11+
It's a good idea to have a Code of Conduct to hold
12+
your community members accountable to and create a
13+
safe and inclusive space for everyone. This helps
14+
establish clear expectations on how community
15+
members should behave respectfully in their
16+
interactions with each other and serves as a
17+
reference for fair arbitration when the need
1718
arises.
1819

19-
You can base your Code of Conduct off of similar
20-
projects' ones or use the [Contributor
21-
Covenant](https://www.contributor-covenant.org/version/2/1/code_of_conduct/code_of_conduct.md)
22-
as a starting point, tailoring it to your
23-
community's specific needs. Larger projects should
24-
have an impartial committee dedicated to handling
25-
Code of Conduct violations, and a method for
26-
community members to privately raise issues to
20+
You can base your Code of Conduct off of similar
21+
projects' ones or use the [Contributor
22+
Covenant](https://www.contributor-covenant.org/version/2/1/code_of_conduct/code_of_conduct.md)
23+
as a starting point, tailoring it to your
24+
community's specific needs. Larger projects should
25+
have an impartial committee dedicated to handling
26+
Code of Conduct violations, and a method for
27+
community members to privately raise issues to
2728
them.
2829

29-
### Assume positive intent and acknowledge
30+
### Assume positive intent and acknowledge
31+
3032
negative impact
31-
Many interpersonal conflicts stem from simple
32-
misunderstandings. It is important to assume
33-
positive intent and acknowledge negative impact to
34-
prevent further escalation of the situation.
35-
Remind everyone that they share the same goals and
36-
try to find commonalities between each party's
37-
reasonings. Validate that perhaps the offending
38-
party meant no malice while also validating the
33+
Many interpersonal conflicts stem from simple
34+
misunderstandings. It is important to assume
35+
positive intent and acknowledge negative impact to
36+
prevent further escalation of the situation.
37+
Remind everyone that they share the same goals and
38+
try to find commonalities between each party's
39+
reasonings. Validate that perhaps the offending
40+
party meant no malice while also validating the
3941
ways that the offended party was hurt.
4042

4143
### When to step in
42-
Once discussions begin to get heated, with
43-
misunderstandings and accusations getting thrown
44-
in, immediate resolution can be difficult. At this point,
45-
project leaders should consider stepping in, asking
46-
involved parties to cool off,
47-
and try to find a way for them to understand each
44+
45+
Once discussions begin to get heated, with
46+
misunderstandings and accusations getting thrown
47+
in, immediate resolution can be difficult. At this point,
48+
project leaders should consider stepping in, asking
49+
involved parties to cool off,
50+
and try to find a way for them to understand each
4851
other.
4952

50-
When the Code of Conduct is violated, you should
51-
take disciplinary action as detailed therein and
52-
communicate to the offending party what they did
53-
wrong and why. Assure the offended party that you
54-
are taking the offense seriously and detail what
55-
actions you took to remedy the situation, as well
56-
as taking into account what their desired outcome
53+
When the Code of Conduct is violated, you should
54+
take disciplinary action as detailed therein and
55+
communicate to the offending party what they did
56+
wrong and why. Assure the offended party that you
57+
are taking the offense seriously and detail what
58+
actions you took to remedy the situation, as well
59+
as taking into account what their desired outcome
5760
is.
5861

59-
Do not wait for a report to take action on a Code
60-
of Conduct violation, it's best to address obvious
61-
breaches of the Code in a timely manner to
62-
demonstrate that it is important and a priority of
63-
your project. Staying proactive helps to cultivate
62+
Do not wait for a report to take action on a Code
63+
of Conduct violation, it's best to address obvious
64+
breaches of the Code in a timely manner to
65+
demonstrate that it is important and a priority of
66+
your project. Staying proactive helps to cultivate
6467
a positive and healthy community dynamic.

0 commit comments

Comments
 (0)