From 83f7685c7edb1d11568cb235335691cc78012de9 Mon Sep 17 00:00:00 2001 From: Victor Poughon <victor.poughon@cnes.fr> Date: Tue, 23 Apr 2019 10:13:53 +0200 Subject: [PATCH] ENH: clang-format is optional in merge checklist --- .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 d9dfd79e5c..7fc46f34b5 100644 --- a/.gitlab/merge_request_templates/request_for_changes.md +++ b/.gitlab/merge_request_templates/request_for_changes.md @@ -39,9 +39,9 @@ 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 - Dashboard is green - Copyright owner has signed the ORFEO ToolBox Contributor License Agreement +- Optionally, run `git diff develop... -U0 --no-color | clang-format-diff.py -p1 -i` on latest changes and commit -- GitLab