chore(workflows): git

2022-06-20 12:04:32 -05:00
parent f527d5f265
commit 31556891ef
2 changed files with 2 additions and 0 deletions
--- a/.github/workflows/promote.develop.yml
+++ b/.github/workflows/promote.develop.yml
@@ -29,6 +29,7 @@ jobs:

      - name: Merge Develop into Main
        run: |
+          git config pull.rebase false
          git checkout main
          git pull origin develop
          git push origin main