From 113d41d50a5bf2399343f6f5409dbd03e8ec5940 Mon Sep 17 00:00:00 2001
From: gilesb <giles.bradshaw@sigyl.com>
Date: Mon, 23 Oct 2023 16:49:56 +0100
Subject: [PATCH] .

---
 .gitea/workflows/build->develop.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml
index 476cf6c..87c6d53 100644
--- a/.gitea/workflows/build->develop.yml
+++ b/.gitea/workflows/build->develop.yml
@@ -43,7 +43,7 @@ jobs:
       - name: push
         run: |
           if [[ $(git branch -r | grep -Fx "  origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
-            git rebase origin/master --strategy-option ours --force-rebase
+            git rebase origin/master --strategy-option ours
             git log -5
             echo no development branch so pushing
             git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};