rebase31

.gitea/workflows/build->develop.yml

@@ -43,8 +43,13 @@ jobs:
       - name: push
         run: |
           if [[ $(git branch -r | grep -Fx "  origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
-            git rebase -Xtheirs origin/master
-            git log -5
+            ls
+            git log -20
+            git status
+            git rebase origin/master --strategy-option=ours
+            ls
+            git log -20
+            git status
             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/pr-closed.yml

@@ -36,6 +36,8 @@ jobs:
       - uses: http://sigyl.com:3000/actions/checkout@v3.5.4
         with:
           token: ${{ secrets.BOT_TOKEN }}
+      - name: tag
+        run: git tag
       - name: delete develop branch
         id: delete_develop_branch
         run: git push origin --delete ${{ github.head_ref }}