From fa289579cb46b399034f3df2b501b10062a9de03 Mon Sep 17 00:00:00 2001
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Thu, 1 Aug 2024 08:47:00 +0200
Subject: [PATCH] checkupdates: drop updates to files that where changed in the
 repo

This allows the fdroiddata maintainers to commit changes and
checkupdates will drop changes to the affected files and only push the
remaining commits.
---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab3b779af8..38005384a8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -337,9 +337,8 @@ checkupdates_runner:
     - echo "${#CHECKUPDATES_APPIDS[@]}"
 
     - fdroid checkupdates --allow-dirty --auto --commit "${CHECKUPDATES_APPIDS[@]}" 2>&1 | tee /tmp/out || true
-    - git pull --rebase origin master
     # when two jobs try to push at the same time they occasionally fail, so try it again
-    - while ! git push origin HEAD:master; do git pull --rebase origin master; done
+    - while ! git push origin HEAD:master; do git pull --rebase --strategy-option=ours origin master; done
     - echo "============== Summary ====================="
     - 'grep -v "INFO: Processing" /tmp/out || true'