diff --git a/basics.html b/basics.html index c1a6aa296fc9c5b50bcbf19842073252e4b0ab7e..47b0ca27f6aeeee32231e7d210ad0e8e12e680c2 100644 --- a/basics.html +++ b/basics.html @@ -920,17 +920,27 @@ - we: review one MR, show line comments in GL, thumbs up </section> - <section id="collab-review" data-markdown> + <section id="collab-review-coc" data-markdown> ## review + ### code of conduct - code of conduct: + 1. be friendly + 1. be responsible + 1. be open + 1. be proactive - - be friendly - - be responsible - - be open - - be creative - - be proactive - - have fun + notes: + - the discussions are usually public, so be aware of that + - decide with your team, write `CONTRIBUTING.md` + </section> + + <section id="collab-review-your-turn" data-markdown> + ## review + ### your turn + + 1. review a merge request + 1. discuss / emote + 1. comment on code </section> <section id="collab-conflicts" data-markdown>