From e690e04532ebf577d5a913334f2d2ee4775094c1 Mon Sep 17 00:00:00 2001 From: Julien Michel <julien.michel@cnes.fr> Date: Fri, 19 Apr 2019 09:28:13 +0200 Subject: [PATCH] Update request_for_changes.md --- .gitlab/merge_request_templates/request_for_changes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/merge_request_templates/request_for_changes.md b/.gitlab/merge_request_templates/request_for_changes.md index 31bf9cb52c..d9dfd79e5c 100644 --- a/.gitlab/merge_request_templates/request_for_changes.md +++ b/.gitlab/merge_request_templates/request_for_changes.md @@ -39,7 +39,7 @@ The copyright owner is *COPYRIGHT OWNER (OR OWNER'S AGENT)* and has signed the O <hr> ***Check before merging:*** - +- Run `git diff develop... -U0 --no-color | clang-format-diff.py -p1 -i` on latest changes and commit - All discussions are resolved - At least 2 :thumbsup: votes from core developers, no :thumbsdown: vote. - The feature branch is (reasonably) up-to-date with the base branch -- GitLab