Merge branch 'main' into testBranch3

Author: GlebChili

.github/workflows/rebase-pr-workflow.yml

@@ -25,23 +25,23 @@ jobs:
              git config --global user.name "GmodNET GitHub Bot"
              git config --global user.email support@gmodnet.xyz
 
+      - name: Extract branch name
+        uses: nelonoel/branch-name@v1.0.1
+
       - name: Checkout
         env:
           GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
         run: |
              gh repo clone ${{ github.repository }} ./
+             git checkout ${{ env.BRANCH_NAME }}
              gh pr checkout ${{ github.event.inputs.prNumber }}
 
-      - name: Extract branch name
-        uses: nelonoel/branch-name@v1.0.1
-
       - name: Rebase and push
         id: rebase_and_push
         continue-on-error: true
         run: |
+             git rebase ${{ env.BRANCH_NAME }}
              git remote set-url origin https://x-access-token:${{ steps.generate_token.outputs.token }}@github.com/${{ github.repository }}.git
-             git fetch origin ${BRANCH_NAME}
-             git rebase ${BRANCH_NAME}
              git push --force
 
       - name: Notify if rebase was unsuccessful