From 79ab28045e3ccbbbb4674436c714f56cfe653f19 Mon Sep 17 00:00:00 2001
From: gilesb <giles.bradshaw@sigyl.com>
Date: Mon, 23 Oct 2023 18:33:23 +0100
Subject: [PATCH] rebase28

---
 .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 4c680d5..b3f8454 100644
--- a/.gitea/workflows/build->develop.yml
+++ b/.gitea/workflows/build->develop.yml
@@ -44,7 +44,7 @@ jobs:
         run: |
           if [[ $(git branch -r | grep -Fx "  origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
             ls
-            git rebase -Xours origin/master
+            git rebase origin/master --strategy-option=ours
             ls
             git log -5
             echo no development branch so pushing