From 25bbe55392e94053e14b47aafd1279a5f3de1b7d Mon Sep 17 00:00:00 2001
From: ServarrAdmin <development@lidarr.audio>
Date: Tue, 19 Aug 2025 07:20:38 -0500
Subject: [PATCH] Fixed: specify merge strategy for git pull in CI sync script

---
 scripts/indexer-sync-v2.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/indexer-sync-v2.sh b/scripts/indexer-sync-v2.sh
index 70634adbe..1fd0cf589 100755
--- a/scripts/indexer-sync-v2.sh
+++ b/scripts/indexer-sync-v2.sh
@@ -1016,7 +1016,7 @@ push_changes() {
             log "SUCCESS" "[$prowlarr_push_remote $push_branch] Branch Pushed"
         else
             log "WARN" "Push failed, attempting to pull and retry..."
-            if git pull "$prowlarr_push_remote" "$push_branch" --no-edit; then
+            if git pull "$prowlarr_push_remote" "$push_branch" --no-edit --no-rebase; then
                 log "INFO" "Successfully pulled changes, retrying push..."
                 if git push "$prowlarr_push_remote" "$push_branch" --force-if-includes; then
                     log "SUCCESS" "[$prowlarr_push_remote $push_branch] Branch Pushed after pull"