Skip to content
GitLab
    • GitLab: the DevOps platform
    • Explore GitLab
    • Install GitLab
    • How GitLab compares
    • Get started
    • GitLab docs
    • GitLab Learn
  • Pricing
  • Talk to an expert
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
    Projects Groups Topics Snippets
  • Register
  • Sign in
  • QEMU QEMU
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
    • Locked files
  • Issues 747
    • Issues 747
    • List
    • Boards
    • Service Desk
    • Milestones
    • Iterations
    • Requirements
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test cases
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Container Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Metrics
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Insights
    • Issue
    • Repository
  • External wiki
    • External wiki
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • QEMUQEMU
  • QEMUQEMU
  • Repository
  • qemu
  • docs
  • devel
  • conflict-resolution.rst
Find file BlameHistoryPermalink
  • Paolo Bonzini's avatar
    docs: Add a QEMU Code of Conduct and Conflict Resolution Policy document · c81cfb89
    Paolo Bonzini authored Mar 31, 2021
    In an ideal world, we would all get along together very well, always be
    polite and never end up in huge conflicts. And even if there are conflicts,
    we would always handle each other fair and respectfully. Unfortunately,
    this is not an ideal world and sometimes people forget how to interact with
    each other in a professional and respectful way. Fortunately, this seldom
    happens in the QEMU community, but for such rare cases it is preferrable
    to have a basic code of conduct document available to show to people
    who are misbehaving.  In case that does not help yet, we should also have
    a conflict resolution policy ready that can be applied in the worst case.
    
    The Code of Conduct document tries to be short and to the point while
    trying to remain friendly and welcoming; it is based on the Fedora Code
    of Conduct[1] with extra detail added based on the Contributor Covenant
    1.3.0[2].  Other proposals included the Contributor Covenant 1.3.0 itself
    or the Django Code of Conduct[3] (which is also a derivative of Fedora's)
    but, in any case, there was agreement on keeping the conflict resolution
    policy separate from the CoC itself.
    
    An important point is whether to apply the code of conduct to violations
    that occur outside public spaces.  The text herein restricts that to
    individuals acting as a representative or a member of the project or
    its community.  This is intermediate between the Contributor Covenant
    (which only mentions representatives of the community, for example using
    an official project e-mail address or posting via an official social media
    account), and the Django Code of Conduct, which says that violations of
    this code outside these spaces "may" be considered but otherwise applies
    no limit.
    
    The conflict resolution policy is based on the Drupal Conflict Resolution
    Policy[4] and its derivative, the Mozilla Consequence Ladder[5].
    
    [1] https://www.fedoraproject.com/code-of-conduct/
    [2] https://www.contributor-covenant.org/version/1/3/0/code-of-conduct/
    [3] https://www.djangoproject.com/conduct/
    [4] https://www.drupal.org/conflict-resolution
    [5] https://github.com/mozilla/diversity/blob/master/code-of-conduct-enforcement/consequence-ladder.md
    
    
    
    Co-developed-by: Thomas Huth's avatarThomas Huth <thuth@redhat.com>
    Reviewed-by: default avatarDavid Edmondson <david.edmondson@oracle.com>
    Reviewed-by: Alex Bennée's avatarAlex Bennée <alex.bennee@linaro.org>
    Reviewed-by: Thomas Huth's avatarThomas Huth <thuth@redhat.com>
    Signed-off-by: Paolo Bonzini's avatarPaolo Bonzini <pbonzini@redhat.com>
    c81cfb89