From 58812abb543bf3e404c91445f129e5c8bb30209f Mon Sep 17 00:00:00 2001
From: gilesb <giles.bradshaw@sigyl.com>
Date: Mon, 23 Oct 2023 17:39:21 +0100
Subject: [PATCH] ssss

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

diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml
index 2ef5645..2666bfb 100644
--- a/.gitea/workflows/build->develop.yml
+++ b/.gitea/workflows/build->develop.yml
@@ -44,8 +44,9 @@ jobs:
         run: |
           if [[ $(git branch -r | grep -Fx "  origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
             echo rebasing with master
-            git rebase origin/master --strategy-option ours
             git log -5
+            git status
+            git rebase origin/master --strategy-option ours
             echo no development branch so pushing
             git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
             curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea;