Skip to content

Commit

Permalink
Merge pull request #52 from PhpSlides/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
dconco authored Dec 24, 2024
2 parents b9a5ccf + 0acaa43 commit 2030f42
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ jobs:

- name: Push changes to main
run: |
git fetch origin
git checkout -b main
git fetch origin main dev
git checkout main
git config pull.rebase false
git pull origin main
git merge origin/dev --allow-unrelated-histories --no-ff
Expand Down

0 comments on commit 2030f42

Please sign in to comment.