Skip to content

Commit

Permalink
chore: use correct merge ref
Browse files Browse the repository at this point in the history
  • Loading branch information
mfal committed Jun 11, 2024
1 parent b9eb311 commit da9ecdf
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/update-client-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

- name: Merge in master ⛙
run: |
git merge origin master --strategy-option theirs
git merge refs/heads/master --strategy-option theirs
- name: Update OpenAPI ⬇️
if: github.ref == 'refs/heads/dev'
Expand Down

0 comments on commit da9ecdf

Please sign in to comment.