Merge remote-tracking branch 'origin/develop' into develop

LinwoodDev · Nov 14, 2021 · cebe815 · cebe815 · vercel · Nov 14, 2021
2 parents d52ddfa + a3c4532
commit cebe815
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,9 +9,12 @@ jobs:
       - uses: actions/checkout@v2
       - run: |
           git --version
+          git config branch.autosetuprebase always
           git config --global user.email "actions@github.com"
           git config --global user.name "Actions"
           git pull --tags
+          git checkout develop
+          git pull
           git checkout main
           git pull
           git rebase develop