From 06e2e52961ccf298f353626bb8337f1701c41d49 Mon Sep 17 00:00:00 2001
From: gilesb <giles.bradshaw@sigyl.com>
Date: Mon, 23 Oct 2023 16:03:44 +0100
Subject: [PATCH] ...

---
 .gitea/workflows/build->develop.yml | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml
index 1902d84..b069593 100644
--- a/.gitea/workflows/build->develop.yml
+++ b/.gitea/workflows/build->develop.yml
@@ -58,23 +58,7 @@ 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 branch -r
-              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 status
-              git add -A
-              git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}"
+              git rebase origin/${{ env.DEVELOPMENT_BRANCH }} --strategy-option ours
               git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
             else
               echo 'no changes so no push'