From 90be7e04d04dd501efd6c61ec74ed6560ba942b5 Mon Sep 17 00:00:00 2001
From: Antenore Gatta <antenore@simbiosi.org>
Date: Thu, 4 Jun 2020 08:52:00 +0200
Subject: Git fetc and merge before to push

Signed-off-by: Antenore Gatta <antenore@simbiosi.org>
---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 75131aa..3d4179e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,6 +55,7 @@ remminai18n build:
     - scripts/i18nstats.sh
     - 'git diff --exit-code --quiet origin/master || git commit -am "Updating pot file via remmina-ci"'
     - lftp -e "cd $REM_CWD/stats ; put data/reports/chartkick.min.js; put data/reports/postats.html; exit" -u "$REM_USER,$REM_PASWD" "$REM_SERVER"
+    - 'git fetch ; git merge --ff --commit -m "Automatic merge from CI"'
     - git push origin master
   when: on_success
 
-- 
cgit v1.2.3