From a0a4d5452680c52d4d365c0d20cbc617c1a7daaf Mon Sep 17 00:00:00 2001
From: Continuous Integration <username@users.noreply.github.com>
Date: Mon, 23 Oct 2023 11:21:56 +0000
Subject: [PATCH] build/16 -> develop/16

---
 .gitea/workflows/build->develop.yml   |  2 --
 .gitea/workflows/develop -> build.yml | 22 ++++++++++++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml
index 934c55a..621d7fb 100644
--- a/.gitea/workflows/build->develop.yml
+++ b/.gitea/workflows/build->develop.yml
@@ -61,8 +61,6 @@ 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
diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml
index 45eeb5b..f9d66c9 100644
--- a/.gitea/workflows/develop -> build.yml	
+++ b/.gitea/workflows/develop -> build.yml	
@@ -45,8 +45,26 @@ jobs:
           git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} "
           git checkout -b ${{ env.BUILD_BRANCH }}
           git merge --squash ${{ github.ref_name }}
-          if [[ $(git diff origin/${{ env.BUILD_BRANCH }} | wc -c) -ne 0 ]]; then 
-            git push -f origin HEAD:${{ env.BUILD_BRANCH }}
+          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 branch -r
+            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 status
+            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'
           fi;