ssss

.gitea/workflows/build->develop.yml

@@ -44,8 +44,9 @@ jobs:
         run: |
           if [[ $(git branch -r | grep -Fx "  origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
             echo rebasing with master
-            git rebase origin/master --strategy-option ours
             git log -5
+            git status
+            git rebase origin/master --strategy-option ours
             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;