chore(workflows): git

2026-10-19 18:03:17 -04:00 · 2022-06-20 12:04:32 -05:00
parent f527d5f265
commit 31556891ef
2 changed files with 2 additions and 0 deletions
@@ -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
@@ -63,6 +63,7 @@ jobs:
      - name: Merge release into develop
        if: ${{ github.ref == 'refs/heads/main' }}
        run: |
+          git config pull.rebase false
          git checkout develop
          git pull origin main
          git push origin develop