From 6349a18588b58c57a4095a1364987b8bf4766612 Mon Sep 17 00:00:00 2001 From: Marcia Ramos Date: Thu, 21 Feb 2019 11:42:21 +0000 Subject: [PATCH 1/2] Update code review guidelines --- doc/development/code_review.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/development/code_review.md b/doc/development/code_review.md index 1b591c7c322..8de02d273ec 100644 --- a/doc/development/code_review.md +++ b/doc/development/code_review.md @@ -203,7 +203,10 @@ first time. - Extract unrelated changes and refactorings into future merge requests/issues. - Seek to understand the reviewer's perspective. - Try to respond to every comment. -- Let the reviewer select the "Resolve discussion" buttons. +- The merge request author resolves only the discussions they have fully + addressed. If there's an open reply, an open discussion, a suggestion, + a question, or anything else, the discussion must be left to be resolved + by the reviewer. - Push commits based on earlier rounds of feedback as isolated commits to the branch. Do not squash until the branch is ready to merge. Reviewers should be able to read individual updates based on their earlier feedback. From cbeab67a270d550b9d925089af53e9cf6ac3d48a Mon Sep 17 00:00:00 2001 From: Marcia Ramos Date: Thu, 21 Feb 2019 16:43:53 +0000 Subject: [PATCH 2/2] Apply suggestion to doc/development/code_review.md --- doc/development/code_review.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/development/code_review.md b/doc/development/code_review.md index 8de02d273ec..f115045dbb7 100644 --- a/doc/development/code_review.md +++ b/doc/development/code_review.md @@ -205,7 +205,7 @@ first time. - Try to respond to every comment. - The merge request author resolves only the discussions they have fully addressed. If there's an open reply, an open discussion, a suggestion, - a question, or anything else, the discussion must be left to be resolved + a question, or anything else, the discussion should be left to be resolved by the reviewer. - Push commits based on earlier rounds of feedback as isolated commits to the branch. Do not squash until the branch is ready to merge. Reviewers should be