Bladeren bron

fix: switch merge to latest as --no-ff (#789)

Jacob Bolda 5 jaren geleden
bovenliggende
commit
f436a245d2
1 gewijzigde bestanden met toevoegingen van 1 en 1 verwijderingen
  1. 1 1
      .github/workflows/pr-to-latest.yml

+ 1 - 1
.github/workflows/pr-to-latest.yml

@@ -18,7 +18,7 @@ jobs:
           git config --global user.name "${{ github.event.pusher.name }}"
           git config --global user.email "${{ github.event.pusher.email }}"
       - run: git fetch origin dev
-      - run: git merge ${{ github.sha }} --ff-only
+      - run: git merge ${{ github.sha }} --no-ff
       - name: Create Pull Request
         uses: tauri-apps/create-pull-request@v2.8.0
         with: