ci: specify how to fixup conflicts when pulling dl cache

.gitlab-ci.yml

@@ -21,7 +21,7 @@ default:
     - mkdir -p ~/.ssh
     - cat gitlab-known-hosts >> ~/.ssh/known_hosts
     - test -d ffs-openwrt-dl-cache || git clone ssh://git@ssh.gitlab.freifunk-stuttgart.de:22220/firmware/ffs-openwrt-dl-cache.git
-    - git -C ffs-openwrt-dl-cache pull || true
+    - git -C ffs-openwrt-dl-cache pull --no-rebase || true
     - rm -rf gluon/openwrt/dl && mkdir -p gluon/openwrt && ln -s ../../ffs-openwrt-dl-cache gluon/openwrt/dl
     - rm -rf gluon/openwrt/staging_dir && mkdir -p staging_dir && ln -s ../../staging_dir gluon/openwrt/staging_dir
   after_script:
@@ -34,9 +34,9 @@ default:
     - mkdir -p ~/.ssh
     - cat gitlab-known-hosts >> ~/.ssh/known_hosts
     - cd gluon/openwrt/dl 
-    - git pull || true
+    - git pull --no-rebase || true
     - git add . && git commit -m "update DL cache" || true
-    - git pull && git push || true
+    - git pull --no-rebase && git push || true
 
 generate_date:
   stage: generate_date