diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6214aa25943225d382f88934f9aa7bfbc54c3ce0..ce24ef55d91470428053ab5069e362122ea5be04 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ test: - java GenerateSite # heuristic to see if any lines were removed! - git fetch origin main - - '(exit $(git diff origin/main HEAD | grep "^-[^-]" | wc -l)) || { echo "Malformed merge request: at least one line is removed in diff." && (exit 1) }' + - '(exit $(git diff origin/main HEAD | grep "^-[^-]" | wc -l)) || { echo "Malformed merge request: at least one line is removed in diff, or feature branch is not up-to-date with the main branch." && (exit 1) }' pages: tags: