Merge Conflict - A Case Study of Peer Conflict Management

Merge Conflict - A Case Study of Peer Conflict Management

JSConf via YouTube Direct link

The who

16 of 32

16 of 32

The who

Class Central Classrooms beta

YouTube videos curated by Class Central.

Classroom Contents

Merge Conflict - A Case Study of Peer Conflict Management

Automatically move to the next video in the Classroom when playback concludes

  1. 1 Intro
  2. 2 Disclaimer
  3. 3 Conflict is a gift
  4. 4 We are programmers
  5. 5 What is conflict
  6. 6 Governance of the Commons
  7. 7 Communication Barriers
  8. 8 Conflict Research
  9. 9 Node Project Activity
  10. 10 Makers
  11. 11 Power grounding
  12. 12 Core values
  13. 13 Cultural acceptance
  14. 14 The tooling
  15. 15 The scope
  16. 16 The who
  17. 17 Requesting moderation
  18. 18 Noncollaborator moderation
  19. 19 Request logging
  20. 20 S scoping
  21. 21 Reddit harassment
  22. 22 Before moderating a post
  23. 23 Removing or blocking an individual
  24. 24 Documentation
  25. 25 Unknown folks
  26. 26 Retaliation
  27. 27 Interaction Limits
  28. 28 Flame Wars
  29. 29 Bad Actors
  30. 30 Training
  31. 31 Selfcare
  32. 32 Conclusion

Never Stop Learning.

Get personalized course recommendations, track subjects and courses with reminders, and more.

Someone learning on their laptop while sitting on the floor.