From 902df4313b0b69d7ca54264cae27759bd8eec237 Mon Sep 17 00:00:00 2001
From: gilesb <giles.bradshaw@sigyl.com>
Date: Mon, 23 Oct 2023 18:10:02 +0100
Subject: [PATCH] ..

---
 .gitea/workflows/build->develop.yml   | 34 +++++++++++++--------------
 .gitea/workflows/develop -> build.yml | 32 ++++++++++++-------------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml
index a782ee5..053a47c 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 -Xtheirs origin/master
             git log -5
             echo no development branch so pushing
             git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
@@ -59,22 +59,22 @@ jobs:
             echo 'pushed new branch and created pr';
           else
             if [[ $(git diff origin/${{ env.DEVELOPMENT_BRANCH }} | wc -c) -ne 0 ]]; then
-              git rebase -Xtheirs origin/${{ env.DEVELOPMENT_BRANCH }}
-              #git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
-              #git -C ../cloned fetch origin #--depth=1
-              #git -C ../cloned checkout $DEVELOPMENT_BRANCH || git -C ../cloned checkout -b $DEVELOPMENT_BRANCH
-              #mv ../cloned/.git ..
-              #rm -rf ../cloned
-              #cp -r . ../cloned
-              #rm -rf ../cloned/.git
-              #mv ../.git ../cloned
-              #mv .git/config ../cloned/.git
-              #rm -r ./*
-              #rm -r .git
-              #mv ../cloned/* .
-              #mv ../cloned/.git .
-              #git add -A
-              #git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}"
+              #git rebase -Xtheirs origin/${{ env.DEVELOPMENT_BRANCH }}
+              git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
+              git -C ../cloned fetch origin #--depth=1
+              git -C ../cloned checkout $DEVELOPMENT_BRANCH || git -C ../cloned checkout -b $DEVELOPMENT_BRANCH
+              mv ../cloned/.git ..
+              rm -rf ../cloned
+              cp -r . ../cloned
+              rm -rf ../cloned/.git
+              mv ../.git ../cloned
+              mv .git/config ../cloned/.git
+              rm -r ./*
+              rm -r .git
+              mv ../cloned/* .
+              mv ../cloned/.git .
+              git add -A
+              git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}"
               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 c0e1c36..f11810d 100644
--- a/.gitea/workflows/develop -> build.yml	
+++ b/.gitea/workflows/develop -> build.yml	
@@ -43,22 +43,22 @@ jobs:
             git push origin HEAD:${{ env.BUILD_BRANCH }};
           else
             if [[ $(git diff origin/${{ env.BUILD_BRANCH }} | wc -c) -ne 0 ]]; then
-              git rebase -Xtheirs origin/${{ env.BUILD_BRANCH }}
-              #git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
-              #git -C ../cloned fetch origin #--depth=1
-              #git -C ../cloned checkout $BUILD_BRANCH || git -C ../cloned checkout -b $BUILD_BRANCH
-              #mv ../cloned/.git ..
-              #rm -rf ../cloned
-              #cp -r . ../cloned
-              #rm -rf ../cloned/.git
-              #mv ../.git ../cloned
-              #mv .git/config ../cloned/.git
-              #rm -r ./*
-              #rm -r .git
-              #mv ../cloned/* .
-              #mv ../cloned/.git .
-              #git add -A
-              #git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} "
+              #git rebase -Xtheirs origin/${{ env.BUILD_BRANCH }}
+              git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
+              git -C ../cloned fetch origin #--depth=1
+              git -C ../cloned checkout $BUILD_BRANCH || git -C ../cloned checkout -b $BUILD_BRANCH
+              mv ../cloned/.git ..
+              rm -rf ../cloned
+              cp -r . ../cloned
+              rm -rf ../cloned/.git
+              mv ../.git ../cloned
+              mv .git/config ../cloned/.git
+              rm -r ./*
+              rm -r .git
+              mv ../cloned/* .
+              mv ../cloned/.git .
+              git add -A
+              git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} "
               git push origin HEAD:${{ env.BUILD_BRANCH }}
             else
               echo 'no changes so no push'