From 90f0bbc07b73099efeb16b24e2e49c540b90222a Mon Sep 17 00:00:00 2001 From: Antenore Gatta Date: Thu, 4 Jun 2020 15:31:16 +0200 Subject: Adding fetch and merge command Signed-off-by: Antenore Gatta --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d4179e..2a5c567 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,6 +31,7 @@ remminadoc build: - cd ../RemminaDoc - git add --all - 'git diff --exit-code --quiet origin/master || git commit -am "Automatic doc build by remmina-ci"' + - 'git fetch ; git merge --ff --commit -m "Automatic merge from CI"' - git push origin master when: on_success -- cgit v1.2.3