From 589c209775588c3195a9402419a4cff74cbc4216 Mon Sep 17 00:00:00 2001
From: giles <giles@noreply.sigyl.com>
Date: Mon, 23 Oct 2023 18:04:06 +0000
Subject: [PATCH] develop/rebase-32 -> build/rebase-32

---
 .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 2f36d58..e1a3c3d 100644
--- a/.gitea/workflows/build->develop.yml
+++ b/.gitea/workflows/build->develop.yml
@@ -46,7 +46,7 @@ jobs:
             ls
             git log -5
             git status
-            git rebase origin/master --strategy-option=theirs
+            git rebase -Xtheirs origin/master
             ls
             git log -4
             git status