From 1139f854121c2978a98da59e96633e7194bb9a44 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   | 6 ++++--
 .gitea/workflows/develop -> build.yml | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml
index 0fde989..cf57a2e 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 }};
@@ -59,7 +59,9 @@ jobs:
             echo 'pushed new branch and created pr';
           else
             if [[ $(git diff origin/${{ env.DEVELOPMENT_BRANCH }} | wc -c) -ne 0 ]]; then
-              git rebase origin/${{ env.DEVELOPMENT_BRANCH }} --strategy-option ours --force-rebase
+              git merge -X ours origin/${{ env.DEVELOPMENT_BRANCH }}
+              git commit -m "merged"
+              # git rebase origin/${{ env.DEVELOPMENT_BRANCH }} --strategy-option ours --force-rebase
               git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
             else
               echo 'no changes so no push'
diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml
index 832e8ed..cd2091a 100644
--- a/.gitea/workflows/develop -> build.yml	
+++ b/.gitea/workflows/develop -> build.yml	
@@ -43,7 +43,9 @@ jobs:
             git push origin HEAD:${{ env.BUILD_BRANCH }};
           else
             if [[ $(git diff origin/${{ env.BUILD_BRANCH }} | wc -c) -ne 0 ]]; then
-              git rebase origin/${{ env.BUILD_BRANCH }} --strategy-option ours --force-rebase
+              git merge -X ours origin/${{ env.BUILD_BRANCH }}
+              git commit -m "megerd"
+              # git rebase origin/${{ env.BUILD_BRANCH }} --strategy-option ours
               git push origin HEAD:${{ env.BUILD_BRANCH }}
             else
               echo 'no changes so no push'