From cbc991fc48109069467c6c7376f3dba89366548b Mon Sep 17 00:00:00 2001
From: gilesb <giles.bradshaw@sigyl.com>
Date: Mon, 23 Oct 2023 17:47:01 +0100
Subject: [PATCH] more theres

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

diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml
index 40bb037..c823dd3 100644
--- a/.gitea/workflows/build->develop.yml
+++ b/.gitea/workflows/build->develop.yml
@@ -61,21 +61,22 @@ jobs:
             echo 'pushed new branch and created pr';
           else
             if [[ $(git diff origin/${{ env.DEVELOPMENT_BRANCH }} | wc -c) -ne 0 ]]; then
-              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 83ddfe8..c0e1c36 100644
--- a/.gitea/workflows/develop -> build.yml	
+++ b/.gitea/workflows/develop -> build.yml	
@@ -43,21 +43,22 @@ jobs:
             git push origin HEAD:${{ env.BUILD_BRANCH }};
           else
             if [[ $(git diff origin/${{ env.BUILD_BRANCH }} | wc -c) -ne 0 ]]; then
-              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'