build/rebase-9 -> develop/rebase-9

.gitea/workflows/build->develop.yml

@@ -42,11 +42,9 @@ jobs:
           echo $(git branch -r | grep -Fx "  origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c)
       - name: push
         run: |
-          git add -A
-          git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }} "
-          
           if [[ $(git branch -r | grep -Fx "  origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
-            git rebase origin/master
+            git rebase origin/master --strategy-option theirs
+            git log -5
             echo no development branch so pushing
             git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
             curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea;

.gitea/workflows/develop -> build.-yml

@@ -44,7 +44,7 @@ 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 }}
+              git rebase origin/${{ env.BUILD_BRANCH }} --strategy ours
               git push origin HEAD:${{ env.BUILD_BRANCH }}
             else
               echo 'no changes so no push'
@@ -55,6 +55,7 @@ jobs:
           curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea
           chmod +x ./tea
           ./tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }}
+          ./tea pr ls -f=base,head -o=csv
           if [[ $(./tea pr ls -f=base,head -o=csv | grep "\"master\",\"${{ github.ref_name }}\"" | head -c1 | wc -c) -eq 0 ]]; then
             ./tea pr c --base=master --head=${{ github.ref_name }} --description="
           development pull request