From 9635a49c066eb843178bd2ac909eded42ff4ff68 Mon Sep 17 00:00:00 2001
From: DarkFighterLuke <luca-consoli@live.it>
Date: Tue, 14 May 2024 19:18:01 +0200
Subject: [PATCH] Fix pull parameter

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b6412cf..7f7ed6e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -75,4 +75,4 @@ jobs:
           commit: --signoff
           message: "Update manifest.json"
           push: "origin HEAD:master"
-          pull: "-X ours origin HEAD:master"
+          pull: "--no-rebase -X ours origin HEAD:master"